From: Florian Forster <octo@collectd.org>
Date: Sat, 25 Nov 2023 12:51:57 +0000 (+0100)
Subject: Netlink plugin: complete initialize structs used for testing.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=203a382da8dc0f5bb58a3a03f4ad9f91f25c470f;p=thirdparty%2Fcollectd.git

Netlink plugin: complete initialize structs used for testing.

Valgrind complains about a conditional jump based on uninitialized
memory:

```
==66438== Conditional jump or move depends on uninitialised value(s)
==66438==    at 0x10CA06: vf_info_submit (in /__w/collectd/collectd/test_plugin_netlink)
==66438==    by 0x1110F2: test_vf_submit_test (in /__w/collectd/collectd/test_plugin_netlink)
==66438==    by 0x112EAC: main (in /__w/collectd/collectd/test_plugin_netlink)
```

This is likely caused by the `vf_stats_t` being only partially
initialized. Using a struct initializer is not only cleaner, it also
ensures the remainder of the struct is initialized to zero.
---

diff --git a/src/netlink_test.c b/src/netlink_test.c
index fba123604..0f50cc9dc 100644
--- a/src/netlink_test.c
+++ b/src/netlink_test.c
@@ -213,25 +213,22 @@ DEF_TEST(ignorelist_test) {
 #ifdef HAVE_IFLA_VF_STATS
 DEF_TEST(vf_submit_test) {
   const char *test_dev = "eth0";
-  vf_stats_t test_stats;
-  struct ifla_vf_mac test_mac;
-  test_mac.mac[0] = 0x01;
-  test_mac.mac[1] = 0x1a;
-  test_mac.mac[2] = 0x2b;
-  test_mac.mac[3] = 0x3c;
-  test_mac.mac[4] = 0x4d;
-  test_mac.mac[5] = 0x5e;
-  test_mac.vf = 2;
-  test_stats.vf_mac = &test_mac;
-  test_stats.vlan = 100;
-  test_stats.spoofcheck = 1;
-  test_stats.link_state = 2;
-  test_stats.broadcast = 1234;
-  test_stats.multicast = 0;
-  test_stats.rx_packets = 21110;
-  test_stats.tx_packets = 31110;
-  test_stats.rx_bytes = 4294967295;
-  test_stats.tx_bytes = 8;
+  vf_stats_t test_stats = {
+      .vf_mac =
+          &(struct ifla_vf_mac){
+              .mac = {0x01, 0x1a, 0x2b, 0x3c, 0x4d, 0x5e},
+              .vf = 2,
+          },
+      .vlan = 100,
+      .spoofcheck = 1,
+      .link_state = 2,
+      .broadcast = 1234,
+      .multicast = 0,
+      .rx_packets = 21110,
+      .tx_packets = 31110,
+      .rx_bytes = 4294967295,
+      .tx_bytes = 8,
+  };
 
   g_instance[0] = '\0';
   vf_info_submit(test_dev, &test_stats);