From 06c184aeea649ff66cd39e98fd53f01729dc5d18 Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Sat, 11 Feb 2017 11:51:46 +0100
Subject: [PATCH] Do not use NULL for va_* variadic functions

---
 src/Makefile |   1 -
 src/event.c  | 114 +++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 84 insertions(+), 31 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 72adbf8f2..3f196602a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -120,7 +120,6 @@ VERSION_TAG             := $(shell test -d .git && git describe --tags --dirty=+
 ##
 
 CFLAGS                  += -pipe -std=c99 -Iinclude/ -Iinclude/lzma_sdk/ -IOpenCL/
-CFLAGS                  += -Wno-format-zero-length
 
 ifeq ($(PRODUCTION),0)
 CFLAGS                  += -W
diff --git a/src/event.c b/src/event.c
index 16c692cec..1d866b36e 100644
--- a/src/event.c
+++ b/src/event.c
@@ -68,15 +68,24 @@ static int event_log (const char *fmt, va_list ap, char *s, const size_t sz)
 
 size_t event_log_info_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 {
-  va_list ap;
+  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
 
-  va_start (ap, fmt);
+  if (fmt == NULL)
+  {
+    event_ctx->msg_buf[0] = 0;
 
-  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
+    event_ctx->msg_len = 0;
+  }
+  else
+  {
+    va_list ap;
 
-  event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
+    va_start (ap, fmt);
 
-  va_end (ap);
+    event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
+
+    va_end (ap);
+  }
 
   event_ctx->msg_newline = false;
 
@@ -87,15 +96,24 @@ size_t event_log_info_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 
 size_t event_log_warning_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 {
-  va_list ap;
+  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
 
-  va_start (ap, fmt);
+  if (fmt == NULL)
+  {
+    event_ctx->msg_buf[0] = 0;
 
-  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
+    event_ctx->msg_len = 0;
+  }
+  else
+  {
+    va_list ap;
+
+    va_start (ap, fmt);
 
-  event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
+    event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
 
-  va_end (ap);
+    va_end (ap);
+  }
 
   event_ctx->msg_newline = false;
 
@@ -106,15 +124,24 @@ size_t event_log_warning_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 
 size_t event_log_error_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 {
-  va_list ap;
+  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
+
+  if (fmt == NULL)
+  {
+    event_ctx->msg_buf[0] = 0;
 
-  va_start (ap, fmt);
+    event_ctx->msg_len = 0;
+  }
+  else
+  {
+    va_list ap;
 
-  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
+    va_start (ap, fmt);
 
-  event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
+    event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
 
-  va_end (ap);
+    va_end (ap);
+  }
 
   event_ctx->msg_newline = false;
 
@@ -125,15 +152,24 @@ size_t event_log_error_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 
 size_t event_log_info (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 {
-  va_list ap;
+  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
 
-  va_start (ap, fmt);
+  if (fmt == NULL)
+  {
+    event_ctx->msg_buf[0] = 0;
 
-  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
+    event_ctx->msg_len = 0;
+  }
+  else
+  {
+    va_list ap;
 
-  event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
+    va_start (ap, fmt);
 
-  va_end (ap);
+    event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
+
+    va_end (ap);
+  }
 
   event_ctx->msg_newline = true;
 
@@ -144,15 +180,24 @@ size_t event_log_info (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 
 size_t event_log_warning (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 {
-  va_list ap;
+  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
 
-  va_start (ap, fmt);
+  if (fmt == NULL)
+  {
+    event_ctx->msg_buf[0] = 0;
 
-  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
+    event_ctx->msg_len = 0;
+  }
+  else
+  {
+    va_list ap;
+
+    va_start (ap, fmt);
 
-  event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
+    event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
 
-  va_end (ap);
+    va_end (ap);
+  }
 
   event_ctx->msg_newline = true;
 
@@ -163,15 +208,24 @@ size_t event_log_warning (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 
 size_t event_log_error (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)
 {
-  va_list ap;
+  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
+
+  if (fmt == NULL)
+  {
+    event_ctx->msg_buf[0] = 0;
 
-  va_start (ap, fmt);
+    event_ctx->msg_len = 0;
+  }
+  else
+  {
+    va_list ap;
 
-  event_ctx_t *event_ctx = hashcat_ctx->event_ctx;
+    va_start (ap, fmt);
 
-  event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
+    event_ctx->msg_len = event_log (fmt, ap, event_ctx->msg_buf, HCBUFSIZ_TINY - 1);
 
-  va_end (ap);
+    va_end (ap);
+  }
 
   event_ctx->msg_newline = true;