gwj / at91sam9263 · Commits

Commit 493ae1f01cad47c3b4143059e986ba76e4d5202e

Authored by pbrook
1 parent 497ad68c

Fix va_list reuse in cpu_abort. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3722 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
@@ -1281,8 +1281,10 @@ int cpu_str_to_log_mask(const char *str) @@ -1281,8 +1281,10 @@ int cpu_str_to_log_mask(const char *str)
1281 void cpu_abort(CPUState *env, const char *fmt, ...) 1281 void cpu_abort(CPUState *env, const char *fmt, ...)
1282 { 1282 {
1283 va_list ap; 1283 va_list ap;
  1284 + va_list ap2;
1284 1285
1285 va_start(ap, fmt); 1286 va_start(ap, fmt);
  1287 + va_copy(ap2, ap);
1286 fprintf(stderr, "qemu: fatal: "); 1288 fprintf(stderr, "qemu: fatal: ");
1287 vfprintf(stderr, fmt, ap); 1289 vfprintf(stderr, fmt, ap);
1288 fprintf(stderr, "\n"); 1290 fprintf(stderr, "\n");
@@ -1298,7 +1300,7 @@ void cpu_abort(CPUState *env, const char *fmt, ...) @@ -1298,7 +1300,7 @@ void cpu_abort(CPUState *env, const char *fmt, ...)
1298 #endif 1300 #endif
1299 if (logfile) { 1301 if (logfile) {
1300 fprintf(logfile, "qemu: fatal: "); 1302 fprintf(logfile, "qemu: fatal: ");
1301 - vfprintf(logfile, fmt, ap); 1303 + vfprintf(logfile, fmt, ap2);
1302 fprintf(logfile, "\n"); 1304 fprintf(logfile, "\n");
1303 #ifdef TARGET_I386 1305 #ifdef TARGET_I386
1304 cpu_dump_state(env, logfile, fprintf, X86_DUMP_FPU | X86_DUMP_CCOP); 1306 cpu_dump_state(env, logfile, fprintf, X86_DUMP_FPU | X86_DUMP_CCOP);
@@ -1308,6 +1310,7 @@ void cpu_abort(CPUState *env, const char *fmt, ...) @@ -1308,6 +1310,7 @@ void cpu_abort(CPUState *env, const char *fmt, ...)
1308 fflush(logfile); 1310 fflush(logfile);
1309 fclose(logfile); 1311 fclose(logfile);
1310 } 1312 }
  1313 + va_end(ap2);
1311 va_end(ap); 1314 va_end(ap);
1312 abort(); 1315 abort();
1313 } 1316 }