OSDN Git Service

fprintf(fp, buf) を fputs(buf, fp) に修正
authorhabu <habu@0568b783-4c39-0410-ac80-bf13821ea2a2>
Fri, 16 Nov 2012 16:11:55 +0000 (16:11 +0000)
committerhabu <habu@0568b783-4c39-0410-ac80-bf13821ea2a2>
Fri, 16 Nov 2012 16:11:55 +0000 (16:11 +0000)
gccのwarningにより発見
bufに%が含まれた場合セキュリティホールとなり得る

src/cmd4.c
src/files.c

index f388fb0..6c0dffa 100644 (file)
@@ -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
index f762a6e..cbeb5b1 100644 (file)
@@ -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)