readelf: Don't assert when addr_size or ref_size is not 4 or 8 in print_ops.

Just report invalid data and continue.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/src/ChangeLog b/src/ChangeLog
index 2cf953e680e125c1934a7e990f10a850c16c8452..1f91de606794d2c388b76135c56a6956f0433387 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-15  Mark Wielaard  <mjw@redhat.com>
+
+       * readelf.c (print_ops): Don't assert when addr_size or ref_size
+       is not 4 or 8, just report invalid data.
+
 2014-12-15  Mark Wielaard  <mjw@redhat.com>
 
        * readelf.c (print_gdb_index_section): Add more bounds checks.

diff --git a/src/readelf.c b/src/readelf.c
index 41239bcade5189abaa60600407cadb83c1bed36a..aa85d73a3ea1ba79214d3e26195f73ca38fc62db 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -3981,11 +3981,10 @@ print_ops (Dwfl_Module *dwflmod, Dwarf *dbg, int indent, int indentrest,
          NEED (addrsize);
          if (addrsize == 4)
            addr = read_4ubyte_unaligned (dbg, data);
+         else if (addrsize == 8)
+           addr = read_8ubyte_unaligned (dbg, data);
          else
-           {
-             assert (addrsize == 8);
-             addr = read_8ubyte_unaligned (dbg, data);
-           }
+           goto invalid;
          data += addrsize;
          CONSUME (addrsize);
 
@@ -3999,16 +3998,13 @@ print_ops (Dwfl_Module *dwflmod, Dwarf *dbg, int indent, int indentrest,
 
        case DW_OP_call_ref:
          /* Offset operand.  */
-         if (ref_size == 0)
+         if (ref_size != 4 && ref_size != 8)
            goto invalid; /* Cannot be used in CFA.  */
          NEED (ref_size);
          if (ref_size == 4)
            addr = read_4ubyte_unaligned (dbg, data);
          else
-           {
-             assert (ref_size == 8);
-             addr = read_8ubyte_unaligned (dbg, data);
-           }
+           addr = read_8ubyte_unaligned (dbg, data);
          data += ref_size;
          CONSUME (ref_size);
 
@@ -4206,16 +4202,13 @@ print_ops (Dwfl_Module *dwflmod, Dwarf *dbg, int indent, int indentrest,
        case DW_OP_GNU_implicit_pointer:
          /* DIE offset operand.  */
          start = data;
-         NEED (ref_size + 1);
-         if (ref_size == 0)
+         NEED (ref_size);
+         if (ref_size != 4 && ref_size != 8)
            goto invalid; /* Cannot be used in CFA.  */
          if (ref_size == 4)
            addr = read_4ubyte_unaligned (dbg, data);
          else
-           {
-             assert (ref_size == 8);
-             addr = read_8ubyte_unaligned (dbg, data);
-           }
+           addr = read_8ubyte_unaligned (dbg, data);
          data += ref_size;
          /* Byte offset operand.  */
          NEED (1);