sim/arm: Prevent NULL pointer dereference in sim_create_inferior.

2013-11-07  Will Newton  <will.newton@linaro.org>

	PR gdb/9195
	* arm/wrapper.c (sim_create_inferior): Avoid calling
	bfd_get_mach with a NULL bfd.

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 0060f81fd6ea6cf69fb2803bf709f9bec6a6b708..bad626f99c9d9a23c7a921253537a5bfcd355a6b 100644 (file)
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-07  Will Newton  <will.newton@linaro.org>
+
+       PR gdb/9195
+       * arm/wrapper.c (sim_create_inferior): Avoid calling
+       bfd_get_mach with a NULL bfd.
+
 2013-06-21  Nick Clifton  <nickc@redhat.com>
 
        * msp430: New Directory.

diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index a4b76835a5044d7e0c0c4927aaed670d9d2de39e..cf10e782a1f27c2fea2612aa0460cb54afaec5a6 100644 (file)
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -244,11 +244,15 @@ sim_create_inferior (sd, abfd, argv, env)
   char **arg;
 
   if (abfd != NULL)
-    ARMul_SetPC (state, bfd_get_start_address (abfd));
+    {
+      ARMul_SetPC (state, bfd_get_start_address (abfd));
+      mach = bfd_get_mach (abfd);
+    }
   else
-    ARMul_SetPC (state, 0);    /* ??? */
-
-  mach = bfd_get_mach (abfd);
+    {
+      ARMul_SetPC (state, 0);  /* ??? */
+      mach = 0;
+    }
 
   switch (mach)
     {