diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
| commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
| tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/file-elf.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/file-elf.c')
| -rw-r--r-- | epan/dissectors/file-elf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c index 9f8384116f..df457e9211 100644 --- a/epan/dissectors/file-elf.c +++ b/epan/dissectors/file-elf.c @@ -1155,7 +1155,7 @@ dissect_elf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) guint64 strtab_offset = 0; guint64 dynstr_offset = 0; - if (tvb_length(tvb) < 52) + if (tvb_captured_length(tvb) < 52) return 0; if (tvb_memeql(tvb, 0, magic, sizeof(magic)) != 0) @@ -1703,8 +1703,8 @@ dissect_elf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) } } - if (segment_info[area_counter - 1].offset + segment_info[area_counter - 1].size < tvb_length(tvb)) { - len = tvb_length(tvb) - (guint) (segment_info[area_counter - 1].offset - segment_info[area_counter - 1].size); + if (segment_info[area_counter - 1].offset + segment_info[area_counter - 1].size < tvb_captured_length(tvb)) { + len = tvb_captured_length(tvb) - (guint) (segment_info[area_counter - 1].offset - segment_info[area_counter - 1].size); proto_tree_add_text(blackhole_tree, tvb, value_guard(segment_info[area_counter - 1].offset + @@ -1713,15 +1713,15 @@ dissect_elf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) segment_info[area_counter - 1].name, len); } - proto_tree_add_text(generated_tree, tvb, 0, 0, "File size: %i", tvb_length(tvb)); + proto_tree_add_text(generated_tree, tvb, 0, 0, "File size: %i", tvb_captured_length(tvb)); proto_tree_add_text(generated_tree, tvb, 0, 0, "Header size + all segment size: %i", (int) file_size); - proto_tree_add_text(generated_tree, tvb, 0, 0, "Total blackholes size: %i", tvb_length(tvb) - (int) file_size); + proto_tree_add_text(generated_tree, tvb, 0, 0, "Total blackholes size: %i", tvb_captured_length(tvb) - (int) file_size); col_clear(pinfo->cinfo, COL_INFO); col_add_str(pinfo->cinfo, COL_INFO, "(ELF)"); /* We jumping around offsets, so treat as bytes as read */ - offset = tvb_length(tvb); + offset = tvb_captured_length(tvb); return offset; } |