diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-03-28 18:08:31 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-03-28 18:08:31 +0000 |
| commit | c475807aab3f290500a5a81dbe1629e9471332b9 (patch) | |
| tree | e450b2e8b30f6bb88cd4908deff48f55f3e7d04a /epan/proto.c | |
| parent | 2d1981f08b9b257b0c245db3576913f27b6442de (diff) | |
| download | wireshark-c475807aab3f290500a5a81dbe1629e9471332b9.tar.gz wireshark-c475807aab3f290500a5a81dbe1629e9471332b9.tar.bz2 wireshark-c475807aab3f290500a5a81dbe1629e9471332b9.zip | |
bugfix: don't call tvb_length_remaining() if tvb is NULL
but what to do instead?
svn path=/trunk/; revision=13958
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/proto.c b/epan/proto.c index 4a928b821c..927d46b540 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -2121,9 +2121,12 @@ alloc_field_info(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, * Ethereal, we don't highlight stuff past * the end of the data. */ - length_remaining = tvb_length_remaining(tvb, start); - if (item_length < 0 || length_remaining < item_length) - item_length = length_remaining; + /* XXX - what to do, if we don't have a tvb? */ + if(tvb) { + length_remaining = tvb_length_remaining(tvb, start); + if (item_length < 0 || length_remaining < item_length) + item_length = length_remaining; + } } if (item_length < 0) { REPORT_DISSECTOR_BUG(g_strdup_printf("\"%s\" - \"%s\" invalid length: %d (%s:%u)", |