diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e2ba5f5917a..34ebe9b0aaa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-14  Pedro Alves  <pedro@codesourcery.com>
+
+	* c-valprint.c (c_val_print): Print a string with unavailable
+	contents as an array.
+
 2011-02-14  Pedro Alves  <pedro@codesourcery.com>
 
 	* value.h (unpack_bits_as_long): Delete declaration.
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index baad597cf02..138aca6d970 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -187,6 +187,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
 	     long as the entire array is valid.  */
           if (c_textual_element_type (unresolved_elttype,
 				      options->format)
+	      && value_bytes_available (original_value, embedded_offset,
+					TYPE_LENGTH (type))
 	      && value_bits_valid (original_value,
 				   TARGET_CHAR_BIT * embedded_offset,
 				   TARGET_CHAR_BIT * TYPE_LENGTH (type)))