From 77d7e81c1c06fe47b07c3252cb21de86dbaedcd5 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Mon, 13 Apr 2015 09:27:57 -0700 Subject: [PATCH] logcat: build regression printflike checks for NULL fmt at compile time, checks for NULL at runtime are optimized out. Regression as a result of commit 5976303aa6e55a9e81eadb35d50f458052e3fa24. Change-Id: Ia4e7ee4b6cb2adf1e6609c70e79684855f76e6fc --- logcat/logcat.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp index 5db539fdd..2b19b93b8 100644 --- a/logcat/logcat.cpp +++ b/logcat/logcat.cpp @@ -342,12 +342,10 @@ static bool getSizeTArg(char *ptr, size_t *val, size_t min = 0, static void logcat_panic(bool showHelp, const char *fmt, ...) { - if (fmt) { - va_list args; - va_start(args, fmt); - vfprintf(stderr, fmt, args); - va_end(args); - } + va_list args; + va_start(args, fmt); + vfprintf(stderr, fmt, args); + va_end(args); if (showHelp) { show_help(getprogname());