diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1f07f38cc5..5331d5b16b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Tom Tromey  <tromey@redhat.com>
+
+	* symtab.c (search_symbols): Introduce a null cleanup for
+	'retval_chain'.
+
 2013-05-30  Tom Tromey  <tromey@redhat.com>
 
 	* python/py-value.c (valpy_binop): Call do_cleanups before
diff --git a/gdb/symtab.c b/gdb/symtab.c
index def556b693..9040035a92 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -3529,7 +3529,7 @@ search_symbols (char *regexp, enum search_domain kind,
 						&datum);
   }
 
-  retval_chain = old_chain;
+  retval_chain = make_cleanup (null_cleanup, NULL);
 
   /* Here, we search through the minimal symbol tables for functions
      and variables that match, and force their symbols to be read.