diff -u -r angband-290/src/object1.c angband/src/object1.c
--- angband-290/src/object1.c	Mon Apr 10 07:42:30 2000
+++ angband/src/object1.c	Thu Jun  8 14:07:44 2000
@@ -911,7 +911,6 @@
 
 
 
-
 /*
  * Creates a description of the item "o_ptr", and stores it in "out_val".
  *
@@ -925,14 +924,10 @@
  * Note that the inscription will be clipped to keep the total description
  * under 79 chars (plus a terminator).
  *
- * This function does no bounds checking.  If object names are altered to
- * be longer than 79 characters, it will cause problems.  Of course, all
- * kinds of user interface code would break anyway, since they sometimes
- * assume that every object name can fit in an 80 (or even 77) character
- * display.  If SAFE_OBJECT_DESC is defined, this function will use a big
- * temporary array to create the description, and will then copy up to 79
- * characters from this array into the buffer, which will prevent crashes
- * (but not ugliness) if any object name uses more than 79 characters.
+ * This function uses a big temporary array to create the description,
+ * and then copies up to 79 characters from this array into the buffer,
+ * which will prevent crashes (but not ugliness) if any object name uses
+ * more than 79 characters.
  *
  * Note the use of "object_desc_int_macro()" and "object_desc_num_macro()"
  * and "object_desc_str_macro()" and "object_desc_chr_macro()" as extremely
@@ -1017,11 +1012,7 @@
 
 	char discount_buf[80];
 
-#ifdef SAFE_OBJECT_DESC
-
-	char tmp_buf[1024];
-
-#endif
+	char tmp_buf[128];
 
 	u32b f1, f2, f3;
 
@@ -1244,18 +1235,9 @@
 	}
 
 
-#ifdef SAFE_OBJECT_DESC
-
 	/* Start dumping the result */
 	t = b = tmp_buf;
 
-#else
-
-	/* Start dumping the result */
-	t = b = buf;
-
-#endif
-
 	/* Begin */
 	s = basenm;
 
@@ -1861,21 +1843,14 @@
 
 object_desc_done:
 
-#ifdef SAFE_OBJECT_DESC
-
 	/* Terminate */
-	tmp_buf[79] = '\0';
+	*t = '\0';
 
-	/* Reset */
-	t = buf;
+	/* Truncate the string to 80 chars */
+	tmp_buf[79] = '\0';
 
 	/* Copy the string over */
-	object_desc_str_macro(t, tmp_buf);
-
-#endif /* SAFE_OBJECT_DESC */
-
-	/* Terminate */
-	*t = '\0';
+	strcpy(buf, tmp_buf);
 }