diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c41b83ae728..f5f605d8ceb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* remote.c (get_offsets): Only call free_symfile_segment_data if
+	data was allocated.
+
 2007-10-03  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* NEWS: Mention XML support for M68K in GDB 6.7.
diff --git a/gdb/remote.c b/gdb/remote.c
index b46fb1308e8..893511e5749 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2134,7 +2134,8 @@ get_offsets (void)
 	do_sections = 0;
     }
 
-  free_symfile_segment_data (data);
+  if (data)
+    free_symfile_segment_data (data);
 
   if (do_sections)
     {