2 files changed, 3 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 254069032ed..18fdeb633f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
         * eval.c (Fdefmacro): Signal an error if NAME is not a symbol.
 
+        * fns.c (Fclear_string): Signal an error if STRING is not a string.
+
 2004-07-05  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * macterm.c (mac_initialize_display_info): Use CGGetActiveDisplayList
diff --git a/src/fns.c b/src/fns.c
index 693f3eaaa93..cbd0dc91d2b 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2370,6 +2370,7 @@ This makes STRING unibyte and may change its length.  */)
      (string)
      Lisp_Object string;
 {
+  CHECK_STRING (string);
   int len = SBYTES (string);
   bzero (SDATA (string), len);
   STRING_SET_CHARS (string, len);