aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2016-11-12 12:08:17 -0700
committerTom Tromey <tom@tromey.com>2017-01-10 19:13:59 -0700
commit9de10f6d53dffbec12cec9843662d5764526983d (patch)
treef574cb2515db4b60057e0a731842edac2f1e9c32
parent2bd5759dcb71adfb26b1c7cf20b3b032af29b845 (diff)
downloadgdb-9de10f6d53dffbec12cec9843662d5764526983d.zip
gdb-9de10f6d53dffbec12cec9843662d5764526983d.tar.gz
gdb-9de10f6d53dffbec12cec9843662d5764526983d.tar.bz2
Change python_run_simple_file to use gdbpy_ref
This changes python_run_simple_file to use gdbpy_ref and unique_xmalloc_ptr. Thi fixes a latent bug in this function, where the error path previously ran the cleanups and then referred to one of the objects just freed. 2017-01-10 Tom Tromey <tom@tromey.com> * python/python.c (python_run_simple_file): Use unique_xmalloc_ptr, gdbpy_ref.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/python/python.c18
2 files changed, 10 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 870b300..7f57d7f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2017-01-10 Tom Tromey <tom@tromey.com>
+ * python/python.c (python_run_simple_file): Use
+ unique_xmalloc_ptr, gdbpy_ref.
+
+2017-01-10 Tom Tromey <tom@tromey.com>
+
* python/py-prettyprint.c (print_stack_unless_memory_error)
(print_string_repr, print_children): Use gdbpy_ref.
(dummy_python_frame): New class.
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 9b5efa1..768d0a8 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -349,25 +349,17 @@ python_run_simple_file (FILE *file, const char *filename)
#else /* _WIN32 */
- char *full_path;
- PyObject *python_file;
- struct cleanup *cleanup;
-
/* Because we have a string for a filename, and are using Python to
open the file, we need to expand any tilde in the path first. */
- full_path = tilde_expand (filename);
- cleanup = make_cleanup (xfree, full_path);
- python_file = PyFile_FromString (full_path, "r");
- if (! python_file)
+ gdb::unique_xmalloc_ptr<char> full_path (tilde_expand (filename));
+ gdbpy_ref python_file (PyFile_FromString (full_path.get (), "r"));
+ if (python_file == NULL)
{
- do_cleanups (cleanup);
gdbpy_print_stack ();
- error (_("Error while opening file: %s"), full_path);
+ error (_("Error while opening file: %s"), full_path.get ());
}
- make_cleanup_py_decref (python_file);
- PyRun_SimpleFile (PyFile_AsFile (python_file), filename);
- do_cleanups (cleanup);
+ PyRun_SimpleFile (PyFile_AsFile (python_file.get ()), filename);
#endif /* _WIN32 */
}