From: Victor Julien <vjulien@oisf.net>
Date: Tue, 26 Apr 2022 19:35:29 +0000 (+0200)
Subject: device: avoid uninit var warning
X-Git-Tag: suricata-6.0.6~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2e30e602c50219c4d5d4683f53a246e5929aa97;p=thirdparty%2Fsuricata.git

device: avoid uninit var warning

cppcheck:

src/util-device.c:455:17: error: Uninitialized variables: *ndev.dev, *ndev.tenant_id_set, *ndev.id, *ndev.next, *ndev.tenant_id, *ndev.offload_orig [uninitvar]
        *ldev = *ndev;
                ^
src/util-device.c:618:36: note: Calling function 'LiveDeviceForEach', 2nd argument '&ndev' value is <Uninit>
    while(LiveDeviceForEach(&ldev, &ndev)) {
                                   ^
src/util-device.c:455:17: note: Uninitialized variables: *ndev.dev, *ndev.tenant_id_set, *ndev.id, *ndev.next, *ndev.tenant_id, *ndev.offload_orig
        *ldev = *ndev;
                ^

Bug: #5291.
(cherry picked from commit 3bc50df9c3397b9ab06376657c5e8c3467fbc7c5)
---

diff --git a/src/util-device.c b/src/util-device.c
index f95696a6c0..0faf9b9391 100644
--- a/src/util-device.c
+++ b/src/util-device.c
@@ -611,7 +611,7 @@ void LiveDevAddBypassSuccess(LiveDevice *dev, uint64_t cnt, int family)
 #ifdef BUILD_UNIX_SOCKET
 TmEcode LiveDeviceGetBypassedStats(json_t *cmd, json_t *answer, void *data)
 {
-    LiveDevice *ldev = NULL, *ndev;
+    LiveDevice *ldev = NULL, *ndev = NULL;
 
     json_t *ifaces = NULL;
     while(LiveDeviceForEach(&ldev, &ndev)) {