Changeset 1437

Timestamp:

06/13/09 10:00:32 (15 months ago)

Author:

ajps

Message:

Fix spell description bug reported by Timo on rgra. Sorts out various uses of text_out to prevent strings read from files or generated by the game being used as format strings.

Location:

trunk/src

Files:

• cmd-know.c (modified) (1 diff)
• cmd5.c (modified) (1 diff)
• wiz-spoil.c (modified) (7 diffs)
• xtra3.c (modified) (1 diff)

trunk/src/cmd-know.c

@@ -1402 +1402 @@
         {
                 int x, y;
-                text_out(e_text + e_ptr->text);
+                text_out("%s", e_text + e_ptr->text);
                 Term_locate(&x, &y);
                 Term_gotoxy(0, y+1);

trunk/src/cmd5.c

@@ -470 +470 @@
         text_out("\n\n   ");
 
-        text_out(s_text + s_info[(cp_ptr->spell_book == TV_MAGIC_BOOK) ? spell : spell + PY_MAX_SPELLS].text);
+        text_out("%s", s_text + s_info[(cp_ptr->spell_book == TV_MAGIC_BOOK) ? spell : spell + PY_MAX_SPELLS].text);
         text_out_c(TERM_L_BLUE, "\n\n[Press any key to continue]\n");
 

trunk/src/wiz-spoil.c

@@ -1 +1 @@
 /*
- * File: wizard1.c
+ * File: wiz-spoil.c
  * Purpose: Spoiler generation
  *
@@ -53 +53 @@
 static void spoiler_underline(cptr str, char c)
 {
-        text_out(str);
+        text_out("%s", str);
         text_out("\n");
         spoiler_out_n_chars(strlen(str), c);
@@ -505 +505 @@
                          * its weight, and its value in gold pieces.
                          */
-                        text_out(format("\nLevel %u, Rarity %u, %d.%d lbs, %ld AU\n",
-                                        a_ptr->level, a_ptr->rarity, (a_ptr->weight / 10),
-                                        (a_ptr->weight % 10), ((long)a_ptr->cost)));
+                        text_out("\nLevel %u, Rarity %u, %d.%d lbs, %ld AU\n",
+                                         a_ptr->level, a_ptr->rarity, (a_ptr->weight / 10),
+                                         (a_ptr->weight % 10), ((long)a_ptr->cost));
 
                         /* Terminate the entry */
@@ -697 +697 @@
 
         /* Dump the header */
-        strnfmt(buf, sizeof(buf), "Monster Spoilers for %s Version %s\n",
+        text_out("Monster Spoilers for %s Version %s\n",
                 VERSION_NAME, VERSION_STRING);
-        text_out(buf);
         text_out("------------------------------------------\n\n");
 
@@ -744 +743 @@
 
                 /* Name */
-                strnfmt(buf, sizeof(buf), "%s  (", (r_name + r_ptr->name));     /* ---)--- */
-                text_out(buf);
+                text_out("%s  (", (r_name + r_ptr->name));      /* ---)--- */
 
                 /* Color */
@@ -751 +749 @@
 
                 /* Symbol --(-- */
-                strnfmt(buf, sizeof(buf), " '%c')\n", r_ptr->d_char);
-                text_out(buf);
+                text_out(" '%c')\n", r_ptr->d_char);
 
 
@@ -759 +756 @@
 
                 /* Number */
-                strnfmt(buf, sizeof(buf), "Num:%d  ", r_idx);
-                text_out(buf);
+                text_out("Num:%d  ", r_idx);
 
                 /* Level */
-                strnfmt(buf, sizeof(buf), "Lev:%d  ", r_ptr->level);
-                text_out(buf);
+                text_out("Lev:%d  ", r_ptr->level);
 
                 /* Rarity */
-                strnfmt(buf, sizeof(buf), "Rar:%d  ", r_ptr->rarity);
-                text_out(buf);
+                text_out("Rar:%d  ", r_ptr->rarity);
 
                 /* Speed */
                 if (r_ptr->speed >= 110)
                 {
-                        strnfmt(buf, sizeof(buf), "Spd:+%d  ", (r_ptr->speed - 110));
+                        text_out("Spd:+%d  ", (r_ptr->speed - 110));
                 }
                 else
                 {
-                        strnfmt(buf, sizeof(buf), "Spd:-%d  ", (110 - r_ptr->speed));
-                }
-                text_out(buf);
+                        text_out("Spd:-%d  ", (110 - r_ptr->speed));
+                }
 
                 /* Hitpoints */
-                strnfmt(buf, sizeof(buf), "Hp:%d  ", r_ptr->avg_hp);
-                text_out(buf);
+                text_out("Hp:%d  ", r_ptr->avg_hp);
 
                 /* Armor Class */
-                strnfmt(buf, sizeof(buf), "Ac:%d  ", r_ptr->ac);
-                text_out(buf);
+                text_out("Ac:%d  ", r_ptr->ac);
 
                 /* Experience */
-                strnfmt(buf, sizeof(buf), "Exp:%ld\n", (long)(r_ptr->mexp));
-                text_out(buf);
+                text_out("Exp:%ld\n", (long)(r_ptr->mexp));
 
                 /* Describe */

trunk/src/xtra3.c

@@ -1668 +1668 @@
                 while (file_getl(fp, buf, sizeof(buf)))
                 {
-                        text_out_e(buf);
+                        text_out_e("%s", buf);
                         text_out("\n");
                 }