diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-06-29 00:44:41 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-06-29 00:44:41 +0000 |
| commit | 768c2b2e309a43944a357031453083a0ab1e4395 (patch) | |
| tree | 59f0751af1e0635fcbd32791fffc4ace5af5e9d0 /epan/dissectors/packet-ber.c | |
| parent | 1b5490f24eddb4c4bb7fe9bdfbac1436bfb3125a (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-ber.c')
| -rw-r--r-- | epan/dissectors/packet-ber.c | 4 |
1 files changed, 4 insertions, 0 deletions
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) || |