readelf: Report invalid data if action table doesn't follow call site table.

Don't assert.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 12b7e7f4b5ed1848fb554d59a0b2f93b7878e8a4..ae3a3d4dcc0be62bb85b551ca30d256b130a2439 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-08  Mark Wielaard  <mjw@redhat.com>
+
+       * readelf.c (print_debug_exception_table): Report invalid data if
+       action table doesn't immediately follow call site table.
+
 2014-12-10  Josh Stone  <jistone@redhat.com>
 
        * addr2line.c (get_diename): New, get linkage_name or name.

diff --git a/src/readelf.c b/src/readelf.c
index fa9ede1d3fd43079107218207ef1d8660250f04d..1db54c6d9caffaf2bfcf6b7c29c704026e07ba00 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -7748,7 +7748,8 @@ print_debug_exception_table (Dwfl_Module *dwflmod __attribute__ ((unused)),
                       "        Action:            %u\n"),
              u++, call_site_start, call_site_length, landing_pad, action);
     }
-  assert (readp == action_table);
+  if (readp != action_table)
+    goto invalid_data;
 
   unsigned int max_ar_filter = 0;
   if (max_action > 0)