osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Squelch some "can't happen in reality" warnings. 

(I guess newer versions of GCC/Clang know that dissect_eh_frame() is
never called with a segment_size of 0, so the loop is traversed at least
once.  NOTE: if it ever *is* called with a segment_size of 0, then
that's a genuine bug and needs to be fixed.)

Also, segment_size is used; no need to mark it as unused.

Change-Id: I63b7a580a853b55f22494de73b4c4e6f9a387647
Reviewed-on: https://code.wireshark.org/review/5591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-12-03 11:03:23 -08:00
parent db462ceb1b
commit b088ca5efd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/file-elf.c
View File

@ -958,16 +958,16 @@ dissect_eh_frame_hdr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *segment_
static gint
dissect_eh_frame(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *segment_tree,
gint offset, gint segment_size _U_, gint register_size _U_, guint machine_encoding)
gint offset, gint segment_size, gint register_size _U_, guint machine_encoding)
{
proto_tree *cfi_tree = NULL;
proto_item *cfi_tree_item = NULL;
proto_tree *entry_tree;
proto_item *pi;
proto_item *pi = NULL;
guint64 length;
guint lengths_size;
gboolean is_cie;
guint entry_size, entry_end;
guint entry_size, entry_end = 0;
guint cfi_size = 0;
guint64 unsigned_value;
gint64 signed_value;