* python/py-progspace.c (py_free_pspace): Obtain arch another

	way to avoid dereferencing a null pointer.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f227b29ddb9129d203bb77d1b2f13c8995a3ce8..42a3b3ee896a2e102d8016894fd32f4d601121c1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-17  Marc Khouzam  <marc.khouzam@ericsson.com>
+
+       * python/py-progspace.c (py_free_pspace): Obtain arch another
+       way to avoid dereferencing a null pointer.
+
 2010-12-17  Michael Snyder  <msnyder@vmware.com>
 
        * utils.c (do_my_cleanups): Comment fix-up.

diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c
index 2c8a677b7090c4cc966232d76f072048dad996f0..093b93f1ba787663fc02929264c3828b2708967d 100644 (file)
--- a/gdb/python/py-progspace.c
+++ b/gdb/python/py-progspace.c
@@ -23,6 +23,7 @@
 #include "progspace.h"
 #include "objfiles.h"
 #include "language.h"
+#include "arch-utils.h"
 
 typedef struct
 {
@@ -134,9 +135,7 @@ py_free_pspace (struct program_space *pspace, void *datum)
 {
   struct cleanup *cleanup;
   pspace_object *object = datum;
-  /* FIXME: What's the right way to get a program space's arch?
-     There may be multiple.  */
-  struct gdbarch *arch = get_objfile_arch (pspace->symfile_object_file);
+  struct gdbarch *arch = get_current_arch ();
 
   cleanup = ensure_python_env (arch, current_language);
   object->pspace = NULL;