| Revision | d35ce4aec281386ea3e96c7e2ae6d6b115637566 (tree) |
|---|---|
| Time | 2012-11-17 01:11:55 |
| Author | habu <habu@0568...> |
| Commiter | habu |
fprintf(fp, buf) を fputs(buf, fp) に修正
gccのwarningにより発見
bufに%が含まれた場合セキュリティホールとなり得る
src/cmd4.c (diff) src/files.c (diff)| @@ -6121,7 +6121,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message) | ||
| 6121 | 6121 | tmpfff = my_fopen(buf, "r"); |
| 6122 | 6122 | if (!tmpfff) { |
| 6123 | 6123 | for (i = 0; html_head[i]; i++) |
| 6124 | - fprintf(fff, html_head[i]); | |
| 6124 | + fputs(html_head[i], fff); | |
| 6125 | 6125 | } |
| 6126 | 6126 | else { |
| 6127 | 6127 | yomikomu = 0; |
| @@ -6183,7 +6183,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message) | ||
| 6183 | 6183 | |
| 6184 | 6184 | if (!tmpfff) { |
| 6185 | 6185 | for (i = 0; html_foot[i]; i++) |
| 6186 | - fprintf(fff, html_foot[i]); | |
| 6186 | + fputs(html_foot[i], fff); | |
| 6187 | 6187 | } |
| 6188 | 6188 | else { |
| 6189 | 6189 | rewind(tmpfff); |
| @@ -9319,7 +9319,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff) | ||
| 9319 | 9319 | quest[i].name, quest[i].level, note); |
| 9320 | 9320 | #endif |
| 9321 | 9321 | |
| 9322 | - fprintf(fff, tmp_str); | |
| 9322 | + fputs(tmp_str, fff); | |
| 9323 | 9323 | |
| 9324 | 9324 | if (quest[i].status == QUEST_STATUS_COMPLETED) |
| 9325 | 9325 | { |
| @@ -9328,7 +9328,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff) | ||
| 9328 | 9328 | #else |
| 9329 | 9329 | sprintf(tmp_str, " Quest Completed - Unrewarded\n"); |
| 9330 | 9330 | #endif |
| 9331 | - fprintf(fff, tmp_str); | |
| 9331 | + fputs(tmp_str, fff); | |
| 9332 | 9332 | } |
| 9333 | 9333 | else |
| 9334 | 9334 | { |
| @@ -9382,7 +9382,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff) | ||
| 9382 | 9382 | } |
| 9383 | 9383 | |
| 9384 | 9384 | /* Print the current random quest */ |
| 9385 | - if (rand_tmp_str[0]) fprintf(fff, rand_tmp_str); | |
| 9385 | + if (rand_tmp_str[0]) fputs(rand_tmp_str, fff); | |
| 9386 | 9386 | |
| 9387 | 9387 | #ifdef JP |
| 9388 | 9388 | if (!total) fprintf(fff, " なし\n"); |
| @@ -9473,7 +9473,7 @@ void do_cmd_knowledge_quests_completed(FILE *fff, int quest_num[]) | ||
| 9473 | 9473 | #endif |
| 9474 | 9474 | } |
| 9475 | 9475 | |
| 9476 | - fprintf(fff, tmp_str); | |
| 9476 | + fputs(tmp_str, fff); | |
| 9477 | 9477 | } |
| 9478 | 9478 | } |
| 9479 | 9479 | #ifdef JP |
| @@ -9547,7 +9547,7 @@ void do_cmd_knowledge_quests_failed(FILE *fff, int quest_num[]) | ||
| 9547 | 9547 | quest[q_idx].name, quest[q_idx].level, quest[q_idx].complev); |
| 9548 | 9548 | #endif |
| 9549 | 9549 | } |
| 9550 | - fprintf(fff, tmp_str); | |
| 9550 | + fputs(tmp_str, fff); | |
| 9551 | 9551 | } |
| 9552 | 9552 | } |
| 9553 | 9553 | #ifdef JP |
| @@ -9589,7 +9589,7 @@ static void do_cmd_knowledge_quests_wiz_random(FILE *fff) | ||
| 9589 | 9589 | sprintf(tmp_str, " %s (%d, %s)\n", |
| 9590 | 9590 | quest[i].name, quest[i].level, r_name+r_info[quest[i].r_idx].name); |
| 9591 | 9591 | #endif |
| 9592 | - fprintf(fff, tmp_str); | |
| 9592 | + fputs(tmp_str, fff); | |
| 9593 | 9593 | } |
| 9594 | 9594 | } |
| 9595 | 9595 | #ifdef JP |
| @@ -4346,7 +4346,7 @@ static void dump_aux_class_special(FILE *fff) | ||
| 4346 | 4346 | |
| 4347 | 4347 | for (i=0;i<=col;i++) |
| 4348 | 4348 | { |
| 4349 | - fprintf(fff, p[i]); | |
| 4349 | + fputs(p[i], fff); | |
| 4350 | 4350 | } |
| 4351 | 4351 | } |
| 4352 | 4352 | else if (p_ptr->pclass == CLASS_MAGIC_EATER) |
Fork