Fix GDB crash with upstream GCC due to qsort(NULL, ...)

Upstream GCC's new pass '-fisolate-erroneous-paths' may introduce
traps at places where GCC has determined undefined behavior, e.g. when
passing a NULL pointer to a function that defines this argument as
__attribute__(__nonnull__(...)).  In particular this applies to
uniquify_strings(), because it invokes qsort() with NULL when the
'strings' vector is empty.  I hit this problem on s390x when trying to
execute "break main" on a C program.

gdb/
2013-11-12  Andreas Arnez  <arnez@linux.vnet.ibm.com>

	* objc-lang.c (uniquify_strings): Prevent invoking qsort with
	NULL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 654183738c881c50b644ed98011cb424f9e8065c..6ad4b49448c53fa06233e8cdbaaa51623a462cb7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-12  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+       * objc-lang.c (uniquify_strings): Prevent invoking qsort with
+       NULL.
+
 2013-11-12  Doug Evans  <dje@google.com>
 
        Work around gold/15646.

diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 77a61acc0579f2a20b080837417b9d6b301fdd7d..5c7234035f9446033c8d35691135efa2468ca59b 100644 (file)
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1056,6 +1056,11 @@ uniquify_strings (VEC (const_char_ptr) **strings)
   const char *elem, *last = NULL;
   int out;
 
+  /* If the vector is empty, there's nothing to do.  This explicit
+     check is needed to avoid invoking qsort with NULL. */
+  if (VEC_empty (const_char_ptr, *strings))
+    return;
+
   qsort (VEC_address (const_char_ptr, *strings),
         VEC_length (const_char_ptr, *strings),
         sizeof (const_char_ptr),