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

Don't try decode an empty octetstring as BER. 

svn path=/trunk/; revision=31589
This commit is contained in:
Stig Bjørlykke 2010-01-20 12:47:26 +00:00
parent 417b1839f1
commit 9b2f05da33
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ber.c
View File

@ -479,7 +479,7 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
guint32 ber_len;
ber_offset = get_ber_identifier(tvb, offset, NULL, &pc, NULL);
ber_offset = get_ber_length(tvb, ber_offset, &ber_len, NULL);
if (pc && (ber_len + (ber_offset - offset) == len)) {
if (pc && (ber_len > 0) && (ber_len + (ber_offset - offset) == len)) {
/* Decoded a constructed ASN.1 tag with a length indicating this
* could be BER encoded data. Try dissecting as unknown BER.
*/