* dbxread.c (set_namestring): Remove cast to unsigned. Check N_STRX

	overflow.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index abfe2dd..f966e9d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * dbxread.c (set_namestring): Remove cast to unsigned.  Check N_STRX
+       overflow.
+
 2009-11-17  Nathan Sidwell  <nathan@codesourcery.com>
 
        * features/m68k-core.xml: New file.

diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 54d8b51..6d4c893 100644 (file)
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -965,8 +965,9 @@ set_namestring (struct objfile *objfile, const struct internal_nlist *nlist)
 {
   char *namestring;
 
-  if (((unsigned) nlist->n_strx + file_string_table_offset)
-      >= DBX_STRINGTAB_SIZE (objfile))
+  if (nlist->n_strx + file_string_table_offset
+      >= DBX_STRINGTAB_SIZE (objfile)
+      || nlist->n_strx + file_string_table_offset < nlist->n_strx)
     {
       complaint (&symfile_complaints, _("bad string table offset in symbol %d"),
                 symnum);