diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b528a9977c9..9d4cc84210e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 Thu Feb 18 04:10:06 1993  John Gilmore  (gnu@cygnus.com)
 
+	* c-lang.c (c_printstr):  Bugfix for length==0 case.
+
 	* c-lang.c (c_printstr):  If a C string ends in a null, don't
 	print the null.
 
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index bfa03d0a590..b96dc1ef950 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -111,7 +111,7 @@ c_printstr (stream, string, length, force_ellipses)
   /* If the string was not truncated due to `set print elements', and
      the last byte of it is a null, we don't print that, in traditional C
      style.  */
-  if ((!force_ellipses) && string[length-1] == '\0')
+  if ((!force_ellipses) && length > 0 && string[length-1] == '\0')
     length--;
 
   if (length == 0)