osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix potential infinite loop introduced with r39961 and find by the buildbot. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6599 

svn path=/trunk/; revision=39963
This commit is contained in:
Chris Maynard 2011-11-21 02:01:59 +00:00
parent 3c8e31e055
commit f2e8579ba3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dissectors/packet-ip.c
View File

@ -1293,16 +1293,18 @@ get_dst_offset(tvbuff_t *tvb, int offset, guint length,
/* Bogus - option length is less than what it's supposed to be for
this option. */
return 0;
} else if (optp != NULL) {
if (opt == IPOPT_SSRR || opt == IPOPT_LSRR) {
/* Hmm, what if you have both options? */
guint8 ptr;
} else {
if (optp != NULL) {
if (opt == IPOPT_SSRR || opt == IPOPT_LSRR) {
/* Hmm, what if you have both options? */
guint8 ptr;
ptr = tvb_get_guint8(tvb, offset + 2);
if (ptr < 4 || (ptr & 3) || (ptr > len)) {
return 0;
ptr = tvb_get_guint8(tvb, offset + 2);
if (ptr < 4 || (ptr & 3) || (ptr > len)) {
return 0;
}
return (offset - orig_offset) + 4 + (len - 4);
}
return (offset - orig_offset) + 4 + (len - 4);
}
len -= 2; /* subtract size of type and length */
offset += 2 + len;