binutils-gdb/gdb/python/py-progspace.c
Tom Tromey 0f6ed0e0ef Fix PR python/19438, PR python/18393 - initialize dictionaries
This fixes PR python/19438 and PR python/18393.  Both bugs are about
invoking dir() on some Python object implemented by gdb, and getting a
crash.

The crash happens because the dictionary field of these objects was
not initialized.  Apparently what happens is that this field can be
lazily initialized by Python when assigning to an attribute; and it
can also be handled ok when using dir() but without __dict__ defined;
but gdb defines __dict__ because this isn't supplied automatically by
Python.

The docs on this seem rather sparse, but this patch works ok.

An alternative might be to lazily create the dictionary in
gdb_py_generic_dict, but I went with this approach because it seemed
more straightforward.

Built and regtested on x86-64 Fedora 23.

2016-05-23  Tom Tromey  <tom@tromey.com>

	PR python/19438, PR python/18393:
	* python/py-objfile.c (objfpy_initialize): Initialize self->dict.
	* python/py-progspace.c (pspy_initialize): Initialize self->dict.

2016-05-23  Tom Tromey  <tom@tromey.com>

	PR python/19438, PR python/18393:
	* gdb.python/py-progspace.exp: Add "dir" test.
	* gdb.python/py-objfile.exp: Add "dir" test.
2016-05-23 10:08:34 -06:00

450 lines
11 KiB
C
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

/* Python interface to program spaces.
Copyright (C) 2010-2016 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "python-internal.h"
#include "charset.h"
#include "progspace.h"
#include "objfiles.h"
#include "language.h"
#include "arch-utils.h"
typedef struct
{
PyObject_HEAD
/* The corresponding pspace. */
struct program_space *pspace;
/* Dictionary holding user-added attributes.
This is the __dict__ attribute of the object. */
PyObject *dict;
/* The pretty-printer list of functions. */
PyObject *printers;
/* The frame filter list of functions. */
PyObject *frame_filters;
/* The frame unwinder list. */
PyObject *frame_unwinders;
/* The type-printer list. */
PyObject *type_printers;
/* The debug method list. */
PyObject *xmethods;
} pspace_object;
extern PyTypeObject pspace_object_type
CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("pspace_object");
static const struct program_space_data *pspy_pspace_data_key;
/* An Objfile method which returns the objfile's file name, or None. */
static PyObject *
pspy_get_filename (PyObject *self, void *closure)
{
pspace_object *obj = (pspace_object *) self;
if (obj->pspace)
{
struct objfile *objfile = obj->pspace->symfile_object_file;
if (objfile)
return host_string_to_python_string (objfile_name (objfile));
}
Py_RETURN_NONE;
}
static void
pspy_dealloc (PyObject *self)
{
pspace_object *ps_self = (pspace_object *) self;
Py_XDECREF (ps_self->dict);
Py_XDECREF (ps_self->printers);
Py_XDECREF (ps_self->frame_filters);
Py_XDECREF (ps_self->frame_unwinders);
Py_XDECREF (ps_self->type_printers);
Py_XDECREF (ps_self->xmethods);
Py_TYPE (self)->tp_free (self);
}
/* Initialize a pspace_object.
The result is a boolean indicating success. */
static int
pspy_initialize (pspace_object *self)
{
self->pspace = NULL;
self->dict = PyDict_New ();
if (self->dict == NULL)
return 0;
self->printers = PyList_New (0);
if (self->printers == NULL)
return 0;
self->frame_filters = PyDict_New ();
if (self->frame_filters == NULL)
return 0;
self->frame_unwinders = PyList_New (0);
if (self->frame_unwinders == NULL)
return 0;
self->type_printers = PyList_New (0);
if (self->type_printers == NULL)
return 0;
self->xmethods = PyList_New (0);
if (self->xmethods == NULL)
return 0;
return 1;
}
static PyObject *
pspy_new (PyTypeObject *type, PyObject *args, PyObject *keywords)
{
pspace_object *self = (pspace_object *) type->tp_alloc (type, 0);
if (self)
{
if (!pspy_initialize (self))
{
Py_DECREF (self);
return NULL;
}
}
return (PyObject *) self;
}
PyObject *
pspy_get_printers (PyObject *o, void *ignore)
{
pspace_object *self = (pspace_object *) o;
Py_INCREF (self->printers);
return self->printers;
}
static int
pspy_set_printers (PyObject *o, PyObject *value, void *ignore)
{
PyObject *tmp;
pspace_object *self = (pspace_object *) o;
if (! value)
{
PyErr_SetString (PyExc_TypeError,
"cannot delete the pretty_printers attribute");
return -1;
}
if (! PyList_Check (value))
{
PyErr_SetString (PyExc_TypeError,
"the pretty_printers attribute must be a list");
return -1;
}
/* Take care in case the LHS and RHS are related somehow. */
tmp = self->printers;
Py_INCREF (value);
self->printers = value;
Py_XDECREF (tmp);
return 0;
}
/* Return the Python dictionary attribute containing frame filters for
this program space. */
PyObject *
pspy_get_frame_filters (PyObject *o, void *ignore)
{
pspace_object *self = (pspace_object *) o;
Py_INCREF (self->frame_filters);
return self->frame_filters;
}
/* Set this object file's frame filters dictionary to FILTERS. */
static int
pspy_set_frame_filters (PyObject *o, PyObject *frame, void *ignore)
{
PyObject *tmp;
pspace_object *self = (pspace_object *) o;
if (! frame)
{
PyErr_SetString (PyExc_TypeError,
"cannot delete the frame filter attribute");
return -1;
}
if (! PyDict_Check (frame))
{
PyErr_SetString (PyExc_TypeError,
"the frame filter attribute must be a dictionary");
return -1;
}
/* Take care in case the LHS and RHS are related somehow. */
tmp = self->frame_filters;
Py_INCREF (frame);
self->frame_filters = frame;
Py_XDECREF (tmp);
return 0;
}
/* Return the list of the frame unwinders for this program space. */
PyObject *
pspy_get_frame_unwinders (PyObject *o, void *ignore)
{
pspace_object *self = (pspace_object *) o;
Py_INCREF (self->frame_unwinders);
return self->frame_unwinders;
}
/* Set this program space's list of the unwinders to UNWINDERS. */
static int
pspy_set_frame_unwinders (PyObject *o, PyObject *unwinders, void *ignore)
{
PyObject *tmp;
pspace_object *self = (pspace_object *) o;
if (!unwinders)
{
PyErr_SetString (PyExc_TypeError,
"cannot delete the frame unwinders list");
return -1;
}
if (!PyList_Check (unwinders))
{
PyErr_SetString (PyExc_TypeError,
"the frame unwinders attribute must be a list");
return -1;
}
/* Take care in case the LHS and RHS are related somehow. */
tmp = self->frame_unwinders;
Py_INCREF (unwinders);
self->frame_unwinders = unwinders;
Py_XDECREF (tmp);
return 0;
}
/* Get the 'type_printers' attribute. */
static PyObject *
pspy_get_type_printers (PyObject *o, void *ignore)
{
pspace_object *self = (pspace_object *) o;
Py_INCREF (self->type_printers);
return self->type_printers;
}
/* Get the 'xmethods' attribute. */
PyObject *
pspy_get_xmethods (PyObject *o, void *ignore)
{
pspace_object *self = (pspace_object *) o;
Py_INCREF (self->xmethods);
return self->xmethods;
}
/* Set the 'type_printers' attribute. */
static int
pspy_set_type_printers (PyObject *o, PyObject *value, void *ignore)
{
PyObject *tmp;
pspace_object *self = (pspace_object *) o;
if (! value)
{
PyErr_SetString (PyExc_TypeError,
"cannot delete the type_printers attribute");
return -1;
}
if (! PyList_Check (value))
{
PyErr_SetString (PyExc_TypeError,
"the type_printers attribute must be a list");
return -1;
}
/* Take care in case the LHS and RHS are related somehow. */
tmp = self->type_printers;
Py_INCREF (value);
self->type_printers = value;
Py_XDECREF (tmp);
return 0;
}
/* Clear the PSPACE pointer in a Pspace object and remove the reference. */
static void
py_free_pspace (struct program_space *pspace, void *datum)
{
struct cleanup *cleanup;
pspace_object *object = (pspace_object *) datum;
/* This is a fiction, but we're in a nasty spot: The pspace is in the
process of being deleted, we can't rely on anything in it. Plus
this is one time when the current program space and current inferior
are not in sync: All inferiors that use PSPACE may no longer exist.
We don't need to do much here, and since "there is always an inferior"
using target_gdbarch suffices.
Note: We cannot call get_current_arch because it may try to access
the target, which may involve accessing data in the pspace currently
being deleted. */
struct gdbarch *arch = target_gdbarch ();
cleanup = ensure_python_env (arch, current_language);
object->pspace = NULL;
Py_DECREF ((PyObject *) object);
do_cleanups (cleanup);
}
/* Return a borrowed reference to the Python object of type Pspace
representing PSPACE. If the object has already been created,
return it. Otherwise, create it. Return NULL and set the Python
error on failure. */
PyObject *
pspace_to_pspace_object (struct program_space *pspace)
{
pspace_object *object;
object = (pspace_object *) program_space_data (pspace, pspy_pspace_data_key);
if (!object)
{
object = PyObject_New (pspace_object, &pspace_object_type);
if (object)
{
if (!pspy_initialize (object))
{
Py_DECREF (object);
return NULL;
}
object->pspace = pspace;
set_program_space_data (pspace, pspy_pspace_data_key, object);
}
}
return (PyObject *) object;
}
int
gdbpy_initialize_pspace (void)
{
pspy_pspace_data_key
= register_program_space_data_with_cleanup (NULL, py_free_pspace);
if (PyType_Ready (&pspace_object_type) < 0)
return -1;
return gdb_pymodule_addobject (gdb_module, "Progspace",
(PyObject *) &pspace_object_type);
}
static PyGetSetDef pspace_getset[] =
{
{ "__dict__", gdb_py_generic_dict, NULL,
"The __dict__ for this progspace.", &pspace_object_type },
{ "filename", pspy_get_filename, NULL,
"The progspace's main filename, or None.", NULL },
{ "pretty_printers", pspy_get_printers, pspy_set_printers,
"Pretty printers.", NULL },
{ "frame_filters", pspy_get_frame_filters, pspy_set_frame_filters,
"Frame filters.", NULL },
{ "frame_unwinders", pspy_get_frame_unwinders, pspy_set_frame_unwinders,
"Frame unwinders.", NULL },
{ "type_printers", pspy_get_type_printers, pspy_set_type_printers,
"Type printers.", NULL },
{ "xmethods", pspy_get_xmethods, NULL,
"Debug methods.", NULL },
{ NULL }
};
PyTypeObject pspace_object_type =
{
PyVarObject_HEAD_INIT (NULL, 0)
"gdb.Progspace", /*tp_name*/
sizeof (pspace_object), /*tp_basicsize*/
0, /*tp_itemsize*/
pspy_dealloc, /*tp_dealloc*/
0, /*tp_print*/
0, /*tp_getattr*/
0, /*tp_setattr*/
0, /*tp_compare*/
0, /*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
0, /*tp_hash */
0, /*tp_call*/
0, /*tp_str*/
0, /*tp_getattro*/
0, /*tp_setattro*/
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT, /*tp_flags*/
"GDB progspace object", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
0, /* tp_methods */
0, /* tp_members */
pspace_getset, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
offsetof (pspace_object, dict), /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
pspy_new, /* tp_new */
};