diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 30b2bb0251..55df48c30d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Tom Tromey  <tromey@redhat.com>
+
+	* cp-namespace.c (cp_lookup_symbol_imports_or_template): Call
+	do_cleanups on all return paths.
+
 2013-05-30  Tom Tromey  <tromey@redhat.com>
 
 	* top.c (execute_command): Discard 'cleanup_if_error' cleanups.
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index add4ccb913..792ed48f34 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -499,7 +499,10 @@ cp_lookup_symbol_imports_or_template (const char *scope,
 				      TYPE_N_TEMPLATE_ARGUMENTS (context),
 				      TYPE_TEMPLATE_ARGUMENTS (context));
 	      if (result != NULL)
-		return result;
+		{
+		  do_cleanups (cleanups);
+		  return result;
+		}
 	    }
 
 	  do_cleanups (cleanups);