Fix segfault in log_internal if prefix is APK_OUT_LOG_ONLY
This commit fixes a regression which was introduced in changeset
646c834492
. If apk_out_fmt() is called
while out->log is set and prefix is set to APK_OUT_LOG_ONLY, then
apk_out_fmt() would pass this prefix to log_internal() which would, in
turn, attempt to write it to standard out using fprintf().
Unfortunately, doing so wont work as intended if prefix is ((char*)-1)
(i.e. APK_OUT_LOG_ONLY) and will cause a segmentation fault instead.
This commit fixes this segmentation fault by not printing the prefix in
log_internal() if it is either NULL or APK_OUT_LOG_ONLY.
cute-signatures
parent
646c834492
commit
1b954e4120
|
@ -127,7 +127,7 @@ static int apk_out_get_width(struct apk_out *out)
|
|||
static void log_internal(FILE *dest, const char *prefix, const char *format, va_list va)
|
||||
{
|
||||
if (dest != stdout) fflush(stdout);
|
||||
if (prefix != NULL) fprintf(dest, "%s", prefix);
|
||||
if (prefix != NULL && prefix != APK_OUT_LOG_ONLY) fprintf(dest, "%s", prefix);
|
||||
vfprintf(dest, format, va);
|
||||
fprintf(dest, "\n");
|
||||
fflush(dest);
|
||||
|
|
Loading…
Reference in New Issue