diff --git a/gas/ChangeLog b/gas/ChangeLog
index c91a0fab5a..ae44dd9e0b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-14  Nick Clifton  <nickc@redhat.com>
+
+	PR 1069
+	* config/tc-crx.c (reset_vars): Use strncpy to prevent overflowing
+	the ins_parse buffer.
+
 2005-07-10  Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.tgt: Remove a29k-*-rtems*, hppa*-*-rtems*,i386-go32-rtems*,
diff --git a/gas/config/tc-crx.c b/gas/config/tc-crx.c
index 3f0c767fbc..9b0b8564c8 100644
--- a/gas/config/tc-crx.c
+++ b/gas/config/tc-crx.c
@@ -268,7 +268,8 @@ reset_vars (char *op)
   memset (& output_opcode, '\0', sizeof (output_opcode));
 
   /* Save a copy of the original OP (used in error messages).  */
-  strcpy (ins_parse, op);
+  strncpy (ins_parse, op, sizeof ins_parse - 1);
+  ins_parse [sizeof ins_parse - 1] = 0;
 }
 
 /* This macro decides whether a particular reloc is an entry in a