diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-11-04 16:08:47 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-11-04 16:08:47 +0000 |
| commit | 3a47213a3d53a02668ff8e83f13b305a01fae569 (patch) | |
| tree | ced784e02aa1cb001767bc9e05fa73923c943a8d /epan/tvbuff.c | |
| parent | 718791f4705dc9e71779410382bd3588b6f64439 (diff) | |
tvb_format_text() always returns a non NULL pointer so don't check return value for NULL pointer
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30821 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 3e7bcba448..1b466af7ff 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -2112,14 +2112,11 @@ tvb_format_text(tvbuff_t *tvb, gint offset, gint size) gint len = size; if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) { - - len = tvb_length_remaining(tvb, offset); - ptr = ensure_contiguous(tvb, offset, len); - + len = tvb_length_remaining(tvb, offset); + ptr = ensure_contiguous(tvb, offset, len); } return format_text(ptr, len); - } /* |