Don't try to use a NULL tvb in call_ber_oid_callback(). Fixes bug 4950.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33363 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index af939db8bac7565a5e4a579c0cb116baea9d2b24..6bc34a4b7b04373b2c2c0bb56186704bb2d5c0c5 100644 (file)
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -747,6 +747,10 @@ call_ber_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
        tvbuff_t *next_tvb;
        const char *syntax = NULL;
 
+       if (!tvb) {
+               return offset;
+       }
+
        next_tvb = tvb_new_subset_remaining(tvb, offset);
        if(oid == NULL ||
           ((((syntax = get_ber_oid_syntax(oid)) == NULL) ||