include/elf/

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

diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index 8a5abaff9d00207ef0accc7f7ae94b1d400ba683..47d916b4b92f33db2cb8ab3da6da911bb04093a9 100644 (file)
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -1,6 +1,6 @@
 /* Convenience functions implemented in Python.
 
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -38,6 +38,7 @@ convert_values_to_python (int argc, struct value **argv)
 {
   int i;
   PyObject *result = PyTuple_New (argc);
+
   for (i = 0; i < argc; ++i)
     {
       PyObject *elt = value_to_value_object (argv[i]);
@@ -57,7 +58,6 @@ static struct value *
 fnpy_call (struct gdbarch *gdbarch, const struct language_defn *language,
           void *cookie, int argc, struct value **argv)
 {
-  int i;
   struct value *value = NULL;
   PyObject *result, *callable, *args;
   struct cleanup *cleanup;
@@ -104,6 +104,7 @@ static int
 fnpy_init (PyObject *self, PyObject *args, PyObject *kwds)
 {
   char *name, *docstring = NULL;
+
   if (! PyArg_ParseTuple (args, "s", &name))
     return -1;
   Py_INCREF (self);
@@ -112,11 +113,17 @@ fnpy_init (PyObject *self, PyObject *args, PyObject *kwds)
     {
       PyObject *ds_obj = PyObject_GetAttrString (self, "__doc__");
       if (ds_obj && gdbpy_is_string (ds_obj))
-       /* Nothing ever frees this.  */
-       docstring = python_string_to_host_string (ds_obj);
+       {
+         docstring = python_string_to_host_string (ds_obj);
+         if (docstring == NULL)
+           {
+             Py_DECREF (self);
+             return -1;
+           }
+       }
     }
   if (! docstring)
-    docstring = _("This function is not documented.");
+    docstring = xstrdup (_("This function is not documented."));
 
   add_internal_function (name, docstring, fnpy_call, self);
   return 0;