diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 59c7470413..f721d4a837 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* c-lang.c (c_get_string): Fix xfree crash on a failed string read.
+
 2009-04-14  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	ARI fix: sprintf rule.
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 0c9e4f8059..e18f173ad1 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -657,7 +657,7 @@ c_get_string (struct value *value, gdb_byte **buffer, int *length,
 			 buffer, length);
       if (err)
 	{
-	  xfree (buffer);
+	  xfree (*buffer);
 	  error (_("Error reading string from inferior: %s"),
 		 safe_strerror (err));
 	}