d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent segfault when trying to print an error message.

Browse source 
Use <stdarg.h> to pass arguments correctly, as ack/util/util.c
already uses <stdarg.h> the same way.
This commit is contained in:
George Koehler 2012-10-24 13:44:50 -04:00
parent 4349d702fa
commit 0fc7fd5d33
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
util/led/error.c
View file

@ -6,13 +6,14 @@
static char rcsid[] = "$Id$"; static char rcsid[] = "$Id$";
#endif #endif
#include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <out.h> #include <out.h>
#include "const.h" #include "const.h"
static short nerrors = 0; static short nerrors = 0;
static diag(); static void diag(char *, char *, va_list);
stop() stop()
{ {
@ -28,40 +29,49 @@ stop()
} }
/* VARARGS1 */ /* VARARGS1 */
fatal(format, a1, a2, a3, a4) void
char *format; fatal(char *format, ...)
{ {
va_list ap;
va_start(ap, format);
nerrors++; nerrors++;
diag("fatal", format, a1, a2, a3, a4); diag("fatal", format, ap);
stop(); stop();
} }
/* VARARGS1 */ /* VARARGS1 */
warning(format, a1, a2, a3, a4) void
char *format; warning(char *format, ...)
{ {
diag("warning", format, a1, a2, a3, a4); va_list ap;
va_start(ap, format);
diag("warning", format, ap);
va_end(ap);
} }
/* VARARGS1 */ /* VARARGS1 */
error(format, a1, a2, a3, a4) void
char *format; error(char *format, ...)
{ {
va_list ap;
va_start(ap, format);
nerrors++; nerrors++;
diag("error", format, a1, a2, a3, a4); diag("error", format, ap);
va_end(ap);
} }
/* VARARGS1 */ /* VARARGS1 */
do_verbose(format, a1, a2, a3, a4) void
char *format; do_verbose(char *format, ...)
{ {
diag((char *) 0, format, a1, a2, a3, a4); va_list ap;
va_start(ap, format);
diag((char *) 0, format, ap);
va_end(ap);
} }
static static void
diag(tail, format, a1, a2, a3, a4) diag(char *tail, char *format, va_list ap)
char *tail;
char *format;
{ {
extern char *progname, *archname, *modulname; extern char *progname, *archname, *modulname;
@ -72,7 +82,7 @@ diag(tail, format, a1, a2, a3, a4)
fprintf(stderr, "%s: ", archname); fprintf(stderr, "%s: ", archname);
else if (modulname) else if (modulname)
fprintf(stderr, "%s: ", modulname); fprintf(stderr, "%s: ", modulname);
fprintf(stderr, format, a1, a2, a3, a4); vfprintf(stderr, format, ap);
if (tail) fprintf(stderr, " (%s)\n", tail); if (tail) fprintf(stderr, " (%s)\n", tail);
else putc('\n', stderr); else putc('\n', stderr);
} }