From d35ce4aec281386ea3e96c7e2ae6d6b115637566 Mon Sep 17 00:00:00 2001
From: habu <habu@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Fri, 16 Nov 2012 16:11:55 +0000
Subject: [PATCH] =?utf8?q?fprintf(fp,=20buf)=20=E3=82=92=20fputs(buf,=20fp?=
 =?utf8?q?)=20=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

gccのwarningにより発見
bufに%が含まれた場合セキュリティホールとなり得る
---
 src/cmd4.c  | 16 ++++++++--------
 src/files.c |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cmd4.c b/src/cmd4.c
index f388fb06e..6c0dffabd 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -6121,7 +6121,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 	tmpfff = my_fopen(buf, "r");
 	if (!tmpfff) {
 		for (i = 0; html_head[i]; i++)
-			fprintf(fff, html_head[i]);
+			fputs(html_head[i], fff);
 	}
 	else {
 		yomikomu = 0;
@@ -6183,7 +6183,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 
 	if (!tmpfff) {
 		for (i = 0; html_foot[i]; i++)
-			fprintf(fff, html_foot[i]);
+			fputs(html_foot[i], fff);
 	}
 	else {
 		rewind(tmpfff);
@@ -9319,7 +9319,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 					quest[i].name, quest[i].level, note);
 #endif
 
-				fprintf(fff, tmp_str);
+				fputs(tmp_str, fff);
 
 				if (quest[i].status == QUEST_STATUS_COMPLETED)
 				{
@@ -9328,7 +9328,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 #else
 					sprintf(tmp_str, "    Quest Completed - Unrewarded\n");
 #endif
-					fprintf(fff, tmp_str);
+					fputs(tmp_str, fff);
 				}
 				else
 				{
@@ -9382,7 +9382,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 	}
 
 	/* Print the current random quest  */
-	if (rand_tmp_str[0]) fprintf(fff, rand_tmp_str);
+	if (rand_tmp_str[0]) fputs(rand_tmp_str, fff);
 
 #ifdef JP
 	if (!total) fprintf(fff, "  ¤Ê¤·\n");
@@ -9473,7 +9473,7 @@ void do_cmd_knowledge_quests_completed(FILE *fff, int quest_num[])
 #endif
 			}
 
-			fprintf(fff, tmp_str);
+			fputs(tmp_str, fff);
 		}
 	}
 #ifdef JP
@@ -9547,7 +9547,7 @@ void do_cmd_knowledge_quests_failed(FILE *fff, int quest_num[])
 					quest[q_idx].name, quest[q_idx].level, quest[q_idx].complev);
 #endif
 			}
-			fprintf(fff, tmp_str);
+			fputs(tmp_str, fff);
 		}
 	}
 #ifdef JP
@@ -9589,7 +9589,7 @@ static void do_cmd_knowledge_quests_wiz_random(FILE *fff)
 			sprintf(tmp_str, "  %s (%d, %s)\n",
 				quest[i].name, quest[i].level, r_name+r_info[quest[i].r_idx].name);
 #endif
-			fprintf(fff, tmp_str);
+			fputs(tmp_str, fff);
 		}
 	}
 #ifdef JP
diff --git a/src/files.c b/src/files.c
index f762a6e1b..cbeb5b168 100644
--- a/src/files.c
+++ b/src/files.c
@@ -4346,7 +4346,7 @@ static void dump_aux_class_special(FILE *fff)
 
 		for (i=0;i<=col;i++)
 		{
-			fprintf(fff, p[i]);
+			fputs(p[i], fff);
 		}
 	}
 	else if (p_ptr->pclass == CLASS_MAGIC_EATER)
-- 
2.11.0