diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4aac2ee7bc..0819a3c87d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-07  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* cp-support.c (mangled_name_to_comp): Initialize storage.
+	(unqualified_name_from_comp): Likewise.
+
 2008-05-07  Jie Zhang  <jie.zhang@analog.com>
 
 	* remote.c (remote_insert_breakpoint): Call get_remote_state
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 696888e04e..3fefb3ccc0 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -180,7 +180,7 @@ mangled_name_to_comp (const char *mangled_name, int options,
 char *
 cp_class_name_from_physname (const char *physname)
 {
-  void *storage;
+  void *storage = NULL;
   char *demangled_name = NULL, *ret;
   struct demangle_component *ret_comp, *prev_comp, *cur_comp;
   int done;
@@ -324,7 +324,7 @@ unqualified_name_from_comp (struct demangle_component *comp)
 char *
 method_name_from_physname (const char *physname)
 {
-  void *storage;
+  void *storage = NULL;
   char *demangled_name = NULL, *ret;
   struct demangle_component *ret_comp;
   int done;