fix py-prettyprint.c

[deliverable/binutils-gdb.git] / gdb / python / py-prettyprint.c

diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index 00fe7a9c51b4b78e62808367c39ca5eaa7db9cab..47e9826276fc5ac492ec0286537c31aa5d820435 100644 (file)
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -1,6 +1,6 @@
 /* Python pretty-printing
 
-   Copyright (C) 2008-2012 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -69,6 +69,7 @@ search_pp_list (PyObject *list, PyObject *value)
          if (!attr)
            return NULL;
          cmp = PyObject_IsTrue (attr);
+         Py_DECREF (attr);
          if (cmp == -1)
            return NULL;
 
@@ -343,18 +344,23 @@ print_string_repr (PyObject *printer, const char *hint,
          string = python_string_to_target_python_string (py_str);
          if (string)
            {
-             gdb_byte *output;
+             char *output;
              long length;
              struct type *type;
 
              make_cleanup_py_decref (string);
+#ifdef IS_PY3K
+             output = PyBytes_AS_STRING (string);
+             length = PyBytes_GET_SIZE (string);
+#else
              output = PyString_AsString (string);
              length = PyString_Size (string);
+#endif
              type = builtin_type (gdbarch)->builtin_char;
 
              if (hint && !strcmp (hint, "string"))
-               LA_PRINT_STRING (stream, type, output, length, NULL,
-                                0, options);
+               LA_PRINT_STRING (stream, type, (gdb_byte *) output,
+                                length, NULL, 0, options);
              else
                fputs_filtered (output, stream);
            }
@@ -383,6 +389,7 @@ print_string_repr (PyObject *printer, const char *hint,
   return result;
 }
 
+#ifndef IS_PY3K
 static void
 py_restore_tstate (void *p)
 {
@@ -458,6 +465,7 @@ push_dummy_python_frame (void)
   make_cleanup (py_restore_tstate, frame->f_back);
   return (PyObject *) frame;
 }
+#endif
 
 /* Helper for apply_val_pretty_printer that formats children of the
    printer, if any exist.  If is_py_none is true, then nothing has
@@ -471,7 +479,10 @@ print_children (PyObject *printer, const char *hint,
 {
   int is_map, is_array, done_flag, pretty;
   unsigned int i;
-  PyObject *children, *iter, *frame;
+  PyObject *children, *iter;
+#ifndef IS_PY3K
+  PyObject *frame;
+#endif
   struct cleanup *cleanups;
 
   if (! PyObject_HasAttr (printer, gdbpy_children_cst))
@@ -515,6 +526,7 @@ print_children (PyObject *printer, const char *hint,
   /* Manufacture a dummy Python frame to work around Python 2.4 bug,
      where it insists on having a non-NULL tstate->frame when
      a generator is called.  */
+#ifndef IS_PY3K
   frame = push_dummy_python_frame ();
   if (!frame)
     {
@@ -522,6 +534,7 @@ print_children (PyObject *printer, const char *hint,
       goto done;
     }
   make_cleanup_py_decref (frame);
+#endif
 
   done_flag = 0;
   for (i = 0; i < options->print_max; ++i)
@@ -617,12 +630,10 @@ print_children (PyObject *printer, const char *hint,
          local_opts.addressprint = 0;
          val_print_string (type, encoding, addr, (int) length, stream,
                            &local_opts);
-
-         do_cleanups (inner_cleanup);
        }
       else if (gdbpy_is_string (py_v))
        {
-         gdb_byte *output;
+         char *output;
 
          output = python_string_to_host_string (py_v);
          if (!output)
@@ -696,6 +707,9 @@ apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
   if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type)))
     return 0;
 
+  if (!gdb_python_initialized)
+    return 0;
+
   cleanups = ensure_python_env (gdbarch, language);
 
   /* Instantiate the printer.  */
@@ -719,8 +733,12 @@ apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
   /* Find the constructor.  */
   printer = find_pretty_printer (val_obj);
   Py_DECREF (val_obj);
+
+  if (printer == NULL)
+    goto done;
+
   make_cleanup_py_decref (printer);
-  if (! printer || printer == Py_None)
+  if (printer == Py_None)
     goto done;
 
   /* If we are printing a map, we want some special formatting.  */