From 2a6ebaaaae035f49d9712d935c356f2e4e6f4bcc Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Tue, 8 Jun 2021 11:31:47 +0200
Subject: [PATCH] Fixes on the array size computation. This work is based on
feedback from Thomas Schlichter. His comments and suggestions were made just
after the original MR was merged.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
common/utils/system.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/utils/system.c b/common/utils/system.c
index 37622932ff7..2ed986fe857 100644
--- a/common/utils/system.c
+++ b/common/utils/system.c
@@ -96,14 +96,14 @@ static void read_pipe(int p, char *b, int size) {
}
}
-static int baseRunTimeCommand(char* cmd) {
+static int baseRunTimeCommand(char* cmd, size_t cmdSize) {
FILE *fp;
size_t retSize = 0;
fp = popen(cmd, "r");
- memset(cmd, 1, sizeof(*cmd));
- retSize = fread(cmd, 1, sizeof(*cmd), fp);
+ memset(cmd, 0, cmdSize);
+ retSize = fread(cmd, 1, cmdSize, fp);
fclose(fp);
if (retSize == 0) {
@@ -115,26 +115,26 @@ static int baseRunTimeCommand(char* cmd) {
int checkIfFedoraDistribution(void) {
char cmd[200];
- memset(cmd, 1, 200);
+ memset(cmd, 0, 200);
sprintf(cmd, "cat /etc/os-release | grep ID_LIKE | grep -ic fedora || true");
- return baseRunTimeCommand(cmd);
+ return baseRunTimeCommand(cmd, 200);
}
int checkIfGenericKernelOnFedora(void) {
char cmd[200];
- memset(cmd, 1, 200);
+ memset(cmd, 0, 200);
sprintf(cmd, "uname -a | grep -c rt || true");
- return (1 - baseRunTimeCommand(cmd));
+ return (1 - baseRunTimeCommand(cmd, 200));
}
int checkIfInsideContainer(void) {
char cmd[200];
int res = 0;
- memset(cmd, 1, 200);
+ memset(cmd, 0, 200);
sprintf(cmd, "cat /proc/self/cgroup | egrep -c 'libpod|podman|kubepods' || true");
- res = baseRunTimeCommand(cmd);
+ res = baseRunTimeCommand(cmd, 200);
if (res > 0)
return 1;
else
--
GitLab