From a9650cd8518ff903437b8b23fee054dace277c7c Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 29 Jun 2010 00:44:41 +0000
Subject: [PATCH] Don't try to use a NULL tvb in call_ber_oid_callback(). Fixes
 bug 4950.

svn path=/trunk/; revision=33363
---
 epan/dissectors/packet-ber.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index af939db8ba..6bc34a4b7b 100644
--- 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) ||