diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-03-30 09:18:25 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-03-30 09:18:25 +0000 |
| commit | 95d12a0bc6565dcdc421c250426e587d110c3a90 (patch) | |
| tree | aab10c0f56e762ba4b71f7f769e4fea2eaca8d3f /epan | |
| parent | 8b334b91483e02f48cc0c12a4a342d0d5ff35fcd (diff) | |
From Tim
small bugfix for packet-ber.c if packet is malformed, prevent dereferenceing a null pointer
svn path=/trunk/; revision=13976
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ber.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 89aba7da4d..111ff9d7a3 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -461,6 +461,7 @@ printf("OCTET STRING dissect_ber_octet_string(%s) entered\n",name); if( (class!=BER_CLASS_UNI) ||((tag<BER_UNI_TAG_NumericString)&&(tag!=BER_UNI_TAG_OCTETSTRING)&&(tag!=BER_UNI_TAG_UTF8String)) ){ proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: OctetString expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag); + if(out_tvb) *out_tvb=NULL; return end_offset; } |