PR gas/12282

[binutils-gdb.git] / gdb / varobj.c

diff --git a/gdb/varobj.c b/gdb/varobj.c
index 09f91eb669df615baa7530925c080bd1d6c5a05d..e87d399cee204356fbc67e9c6a359bd860328c16 100644 (file)
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -2479,7 +2479,7 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
                       struct varobj *var)
 {
   struct ui_file *stb;
-  struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
+  struct cleanup *old_chain;
   gdb_byte *thevalue = NULL;
   struct value_print_options opts;
   struct type *type = NULL;
@@ -2493,6 +2493,9 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
   if (value == NULL)
     return NULL;
 
+  stb = mem_fileopen ();
+  old_chain = make_cleanup_ui_file_delete (stb);
+
   gdbarch = get_type_arch (value_type (value));
 #if HAVE_PYTHON
   {
@@ -2505,7 +2508,10 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
        /* First check to see if we have any children at all.  If so,
           we simply return {...}.  */
        if (dynamic_varobj_has_child_method (var))
-         return xstrdup ("{...}");
+         {
+           do_cleanups (old_chain);
+           return xstrdup ("{...}");
+         }
 
        if (PyObject_HasAttr (value_formatter, gdbpy_to_string_cst))
          {
@@ -2522,7 +2528,8 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
              }
 
            output = apply_varobj_pretty_printer (value_formatter,
-                                                 &replacement);
+                                                 &replacement,
+                                                 stb);
            if (output)
              {
                make_cleanup_py_decref (output);
@@ -2567,9 +2574,6 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
   }
 #endif
 
-  stb = mem_fileopen ();
-  make_cleanup_ui_file_delete (stb);
-
   get_formatted_print_options (&opts, format_code[(int) format]);
   opts.deref_ref = 0;
   opts.raw = 1;