Skip to contentSkip to conversation

tools/libs/stat: fix broken build

PATCH Superseded Juergen Gross 2 participants 2 messages Sep 12, 2020

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tools/libs/stat: fix broken build

Making getBridge() static triggered a build error with some gcc versions:

error: 'strncpy' output may be truncated copying 15 bytes from a string of length 255 [-Werror=stringop-truncation]

Fix that by using a buffer with 256 bytes instead.

Fixes 6d0ec053907794 ("tools: split libxenstat into new tools/libs/stat directory")
---
 tools/libs/stat/xenstat_linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/libs/stat/xenstat_linux.c +1 -1
index 793263f2b6..4fee63e36d 100644
@@ -264,7 +264,7 @@ int xenstat_collect_networks(xenstat_node * node)
 {
 	/* Helper variables for parseNetDevLine() function defined above */
 	int i;
-	char line[512] = { 0 }, iface[16] = { 0 }, devBridge[16] = { 0 }, devNoBridge[17] = { 0 };
+	char line[512] = { 0 }, iface[16] = { 0 }, devBridge[256] = { 0 }, devNoBridge[257] = { 0 };
 	unsigned long long rxBytes, rxPackets, rxErrs, rxDrops, txBytes, txPackets, txErrs, txDrops;
 
 	struct priv_data *priv = get_priv_data(node->handle);
Signature · 1 line
2.26.2
#1 lore raw
Quoted 18 lines · Juergen Gross

Making getBridge() static triggered a build error with some gcc versions:

error: 'strncpy' output may be truncated copying 15 bytes from a string of length 255 [-Werror=stringop-truncation]

Fix that by using a buffer with 256 bytes instead.

Fixes 6d0ec053907794 ("tools: split libxenstat into new tools/libs/stat directory")
---
 tools/libs/stat/xenstat_linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/libs/stat/xenstat_linux.c +0 -0
index 793263f2b6..4fee63e36d 100644

tools/libs/stat/xenstat_linux.c int xenstat_collect_networks(xenstat_node * node) · line 270

Quoted 8 lines
tools/libs/stat/xenstat_linux.c +1 -1
@@ -264,7 +264,7 @@ int xenstat_collect_networks(xenstat_node * node)
 {
 	/* Helper variables for parseNetDevLine() function defined above */
 	int i;
-	char line[512] = { 0 }, iface[16] = { 0 }, devBridge[16] = { 0 }, devNoBridge[17] = { 0 };
+	char line[512] = { 0 }, iface[16] = { 0 }, devBridge[256] = { 0 }, devNoBridge[257] = { 0 };
 	unsigned long long rxBytes, rxPackets, rxErrs, rxDrops, txBytes, txPackets, txErrs, txDrops;
 
 	struct priv_data *priv = get_priv_data(node->handle);

:(

In function 'getBridge',
    inlined from 'xenstat_collect_networks' at xenstat_linux.c:306:2:
xenstat_linux.c:81:6: error: 'strncpy' output may be truncated copying 255 bytes from a string of length 255 [-Werror=stringop-truncation] 81 |      strncpy(result, de->d_name, resultLen - 1);
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'getBridge',
    inlined from 'xenstat_collect_networks' at xenstat_linux.c:306:2:
xenstat_linux.c:81:6: error: 'strncpy' output may be truncated copying 255 bytes from a string of length 255 [-Werror=stringop-truncation] 81 |      strncpy(result, de->d_name, resultLen - 1);
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

~Andrew