libdw: Check diridx is valid under DW_LNE_define_file in dwarf_getsrclines.

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

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 4f03b736e693a9cc3912f75653dffcb003c13c09..61c987113a509bee1d57f888b91c82fbf6d86410 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-16  Mark Wielaard  <mjw@redhat.com>
+
+       * dwarf_getsrclines.c (read_srclines): Check diridx is valid under
+       DW_LNE_define_file.
+
 2014-12-16  Mark Wielaard  <mjw@redhat.com>
 
        * dwarf_getpubnames.c (dwarf_getpubnames): Make sure there is enough

diff --git a/libdw/dwarf_getsrclines.c b/libdw/dwarf_getsrclines.c
index d477944669779a02f7b0b2fd04b615a9293d9d98..053b30f2f0a5874d547d18a4f941c0c178e6f99f 100644 (file)
--- a/libdw/dwarf_getsrclines.c
+++ b/libdw/dwarf_getsrclines.c
@@ -469,6 +469,11 @@ read_srclines (Dwarf *dbg,
                if (unlikely (linep >= lineendp))
                  goto invalid_data;
                get_uleb128 (diridx, linep, lineendp);
+               if (unlikely (diridx >= ndirlist))
+                 {
+                   __libdw_seterrno (DWARF_E_INVALID_DIR_IDX);
+                   goto invalid_data;
+                 }
                Dwarf_Word mtime;
                if (unlikely (linep >= lineendp))
                  goto invalid_data;