* regcache.c (new_register_cache): Return NULL if the register

	cache size isn't known yet.
	(free_register_cache): Avoid dereferencing a NULL regcache.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b84dc01..0b5d10b 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-08  Pedro Alves  <pedro@codesourcery.com>
+
+       * regcache.c (new_register_cache): Return NULL if the register
+       cache size isn't known yet.
+       (free_register_cache): Avoid dereferencing a NULL regcache.
+
 2008-09-04  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * configure.srv: Merge MIPS and MIPS64.

diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c
index a324d43..b5ec215 100644 (file)
--- a/gdb/gdbserver/regcache.c
+++ b/gdb/gdbserver/regcache.c
@@ -91,6 +91,9 @@ new_register_cache (void)
 {
   struct inferior_regcache_data *regcache;
 
+  if (register_bytes == 0)
+    return NULL; /* The architecture hasn't been initialized yet.  */
+
   regcache = malloc (sizeof (*regcache));
 
   /* Make sure to zero-initialize the register cache when it is created,
@@ -111,8 +114,11 @@ free_register_cache (void *regcache_p)
   struct inferior_regcache_data *regcache
     = (struct inferior_regcache_data *) regcache_p;
 
-  free (regcache->registers);
-  free (regcache);
+  if (regcache)
+    {
+      free (regcache->registers);
+      free (regcache);
+    }
 }
 
 static void