2001-04-16 Daniel Berlin <[email protected]>

	* demangle.c (_initialize_demangler): Use xcalloc on the
	demangling_style_names, and make it a null terminated array of
	names, to avoid a crash.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 807aa0b7f8f15c0a5cbc5dd88ecc0afd274c2c30..db36920d705e4edf6cb7fa810be2f0f179a5e498 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-16  Daniel Berlin  <[email protected]>
+
+       * demangle.c (_initialize_demangler): Use xcalloc on the
+       demangling_style_names, and make it a null terminated array of
+       names, to avoid a crash.
+
 2001-04-16  Mark Kettenis  <[email protected]>
 
        * i386-tdep.c (i386_frame_chain): New function.

diff --git a/gdb/demangle.c b/gdb/demangle.c
index 4b5bc9becbd356f3c4ceeaf5afc3e575b27ed53c..0104d8f3f6e92a53fca907913b74ee9a0dc1273c 100644 (file)
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -186,7 +186,7 @@ _initialize_demangler (void)
        libiberty_demanglers[ndems].demangling_style != unknown_demangling; 
        ndems++)
     ;
-  demangling_style_names = xmalloc (ndems * sizeof (char *));
+  demangling_style_names = xcalloc (ndems + 1, sizeof (char *));
   for (i = 0;
        libiberty_demanglers[i].demangling_style != unknown_demangling; 
        i++)