From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Sat, 18 Dec 2010 01:28:06 +0000 (+0000)
Subject: * python/py-progspace.c (py_free_pspace): Obtain arch another
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4014e677f8e6fa8d36051fe92a08e1d3dceebf65;p=thirdparty%2Fbinutils-gdb.git

* 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 ef0b0a7b638..fff3a49a16d 100644
--- 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-12  Stan Shebs  <stan@codesourcery.com>
 
 	* value.c (value_of_internalvar): Add case for trace state
diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c
index 87245328c83..71a1c9f2d69 100644
--- 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;