diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-04-22 09:56:03 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-04-22 21:26:37 +0000 |
| commit | e0eefbe20ad5a4e6618e71939f25957559b2a1ab (patch) | |
| tree | 449f42ee6abb7038d6180e8ef40ef80d59077a08 | |
| parent | 13dc91f5b6b4c44e8a3056e6923f3435ce7c286a (diff) | |
tvbuff_composite.c: do not recompute abs_length
abs_length is already computed by the caller of composite_get_ptr (ensure_contiguous_no_exception).
No need to do the work another time
Change-Id: I93edd6d405b2d5afe99dc7c781ecea4b395ef7bd
Reviewed-on: https://code.wireshark.org/review/15053
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/tvbuff_composite.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/epan/tvbuff_composite.c b/epan/tvbuff_composite.c index 15bf96b2c0..f43628b96a 100644 --- a/epan/tvbuff_composite.c +++ b/epan/tvbuff_composite.c @@ -112,11 +112,6 @@ composite_get_ptr(tvbuff_t *tvb, guint abs_offset, guint abs_length) return tvb_get_ptr(member_tvb, member_offset, abs_length); } else { - abs_offset = 0; - abs_length = 0; - - tvb_check_offset_length(tvb, 0, -1, &abs_offset, &abs_length); - tvb->real_data = (guint8 *)g_malloc(abs_length); tvb_memcpy(tvb, (void *)tvb->real_data, 0, abs_length); return tvb->real_data + abs_offset; |