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

h261: fix "hf->bitmask != 0" assertion 

fuzz-2014-03-13-20306.pcap from bug 9887 triggered:

    Dissector bug, protocol H.261, in packet 978: epan/proto.c:8418:
    failed assertion "hf->bitmask != 0" (h261.sbit)

Fixes regression from v1.99.6rc0-311-g8d6324f.

Change-Id: I69f537576743347cad41873222b4905d48c2fb8d
Reviewed-on: https://code.wireshark.org/review/11194
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Peter Wu 2015-10-21 17:27:11 +02:00 committed by Michael Mann
parent c1331a1e77
commit ed27dad41e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-h261.c
View File

@ -124,7 +124,7 @@ proto_register_h261(void)
FT_UINT8,
BASE_DEC,
NULL,
0x0,
0xe0,
NULL, HFILL
}
},
@ -136,7 +136,7 @@ proto_register_h261(void)
FT_UINT8,
BASE_DEC,
NULL,
0x0,
0x1c,
NULL, HFILL
}
},
@ -146,9 +146,9 @@ proto_register_h261(void)
"Intra frame encoded data flag",
"h261.i",
FT_BOOLEAN,
BASE_NONE,
8,
NULL,
0x0,
0x02,
NULL, HFILL
}
},
@ -158,9 +158,9 @@ proto_register_h261(void)
"Motion vector flag",
"h261.v",
FT_BOOLEAN,
BASE_NONE,
8,
NULL,
0x0,
0x01,
NULL, HFILL
}
},