From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 13 Jan 2021 15:40:06 +0000 (-0600)
Subject: lua: fix coverity issue with out of scope variable
X-Git-Tag: suricata-7.0.0-beta1~1868
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=512b0350a0bbdd54b63d017295bf9d332bed6a9f;p=thirdparty%2Fsuricata.git

lua: fix coverity issue with out of scope variable

Fix usage of out-of-scope variables. Introduced with the hashing
and adding the guard of g_disable_hashing.

To fix, just remove the guard so all variables are in scope. Hashes
are not initialized here so there is no need for the guard.
---

diff --git a/src/util-lua-common.c b/src/util-lua-common.c
index ecc93dcb6d..2a81703ef6 100644
--- a/src/util-lua-common.c
+++ b/src/util-lua-common.c
@@ -757,36 +757,35 @@ static int LuaCallbackFileInfoPushToStackFromFile(lua_State *luastate, const Fil
     char *md5ptr = NULL;
     char *sha1ptr = NULL;
     char *sha256ptr = NULL;
-    if (!g_disable_hashing) {
-        char md5[33] = "";
-        md5ptr = md5;
-        if (file->flags & FILE_MD5) {
-            size_t x;
-            for (x = 0; x < sizeof(file->md5); x++) {
-                char one[3] = "";
-                snprintf(one, sizeof(one), "%02x", file->md5[x]);
-                strlcat(md5, one, sizeof(md5));
-            }
+
+    char md5[33] = "";
+    md5ptr = md5;
+    if (file->flags & FILE_MD5) {
+        size_t x;
+        for (x = 0; x < sizeof(file->md5); x++) {
+            char one[3] = "";
+            snprintf(one, sizeof(one), "%02x", file->md5[x]);
+            strlcat(md5, one, sizeof(md5));
         }
-        char sha1[41] = "";
-        sha1ptr = sha1;
-        if (file->flags & FILE_SHA1) {
-            size_t x;
-            for (x = 0; x < sizeof(file->sha1); x++) {
-                char one[3] = "";
-                snprintf(one, sizeof(one), "%02x", file->sha1[x]);
-                strlcat(sha1, one, sizeof(sha1));
-            }
+    }
+    char sha1[41] = "";
+    sha1ptr = sha1;
+    if (file->flags & FILE_SHA1) {
+        size_t x;
+        for (x = 0; x < sizeof(file->sha1); x++) {
+            char one[3] = "";
+            snprintf(one, sizeof(one), "%02x", file->sha1[x]);
+            strlcat(sha1, one, sizeof(sha1));
         }
-        char sha256[65] = "";
-        sha256ptr = sha256;
-        if (file->flags & FILE_SHA256) {
-            size_t x;
-            for (x = 0; x < sizeof(file->sha256); x++) {
-                char one[3] = "";
-                snprintf(one, sizeof(one), "%02x", file->sha256[x]);
-                strlcat(sha256, one, sizeof(sha256));
-            }
+    }
+    char sha256[65] = "";
+    sha256ptr = sha256;
+    if (file->flags & FILE_SHA256) {
+        size_t x;
+        for (x = 0; x < sizeof(file->sha256); x++) {
+            char one[3] = "";
+            snprintf(one, sizeof(one), "%02x", file->sha256[x]);
+            strlcat(sha256, one, sizeof(sha256));
         }
     }