diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-11-04 16:08:47 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-11-04 16:08:47 +0000 |
| commit | dc265696a11f0e2f0eee7516db11f326d1151725 (patch) | |
| tree | ced784e02aa1cb001767bc9e05fa73923c943a8d /epan/tvbuff.c | |
| parent | 83231fe94a1e07a6994bff7f135e73f0a69409da (diff) | |
tvb_format_text() always returns a non NULL pointer so don't check return value for NULL pointer
svn path=/trunk/; revision=30821
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); - } /* |