osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

clean up tvb_get_guintvar() a bit more 

Wrap long lines.

Use a do-while loop. We know up-front that we'll go into the loop at
least once. Remove the cont variable, use the exit condition directly.

Set *octetCount = 0 if we return 0 because of an error. In that case, we
did not process any bytes and should inform the caller about this.

Change-Id: I222270939e42e0096b6f5a25b197bd4bae12235e
Reviewed-on: https://code.wireshark.org/review/26245
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Martin Kaiser 2018-03-03 16:22:33 +01:00 committed by Anders Broman
parent 59af408e9e
commit 4630b4fcf8
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
epan/dissectors/packet-wap.c
View File

@ -28,44 +28,49 @@
* the final value. Can be pre-initialised to start at offset+count.
*/
guint
tvb_get_guintvar (tvbuff_t *tvb, guint offset, guint *octetCount, packet_info *pinfo, expert_field *ei)
tvb_get_guintvar (tvbuff_t *tvb, guint offset,
guint *octetCount, packet_info *pinfo, expert_field *ei)
{
guint value = 0;
guint octet;
guint counter = 0;
char cont = 1;
#ifdef DEBUG
fprintf (stderr,
"dissect_wap: Starting tvb_get_guintvar at offset %d\n", offset);
#endif
while (cont != 0)
{
value <<= 7; /* Value only exists in 7 of the 8 bits */
do {
octet = tvb_get_guint8 (tvb, offset+counter);
counter += 1;
value += (octet & 0x7F);
cont = (octet & 0x80);
#ifdef DEBUG
fprintf (stderr, "dissect_wap: computing: octet is %d (0x%02x), count=%d, value=%d, cont=%d\n",
octet, octet, counter, value, cont);
#endif
}
if (counter > sizeof(value)) {
proto_tree_add_expert(NULL, pinfo, ei, tvb, offset, counter);
value = 0;
}
if (octetCount != NULL)
{
counter++;
if (counter > sizeof(value)) {
proto_tree_add_expert(NULL, pinfo, ei, tvb, offset, counter);
value = 0;
counter = 0;
break;
}
value <<= 7; /* Value only exists in 7 of the 8 bits */
value += (octet & 0x7F);
#ifdef DEBUG
fprintf(stderr,
"dissect_wap: computing: octet is %d (0x%02x), count=%d, value=%d\n",
octet, octet, counter, value);
#endif
} while (octet & 0x80);
#ifdef DEBUG
fprintf (stderr,
"dissect_wap: Leaving tvb_get_guintvar count=%d, value=%u\n",
counter, value);
#endif
if (octetCount)
*octetCount = counter;
#ifdef DEBUG
fprintf (stderr, "dissect_wap: Leaving tvb_get_guintvar count=%d, value=%u\n", *octetCount, value);
#endif
}
return (value);
return value;
}
/*