blob: 7af265a999d1feece5f91983b192a09f5e3b4ccf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From e25d00d8297cba044c3a4d2e38749e54adac66c1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 22 Dec 2018 19:59:02 -0800
Subject: [PATCH] misc: Do not print NULL string into logs
string format %s is getting a NULL pointer for 'expand'
parameter always since the check for chunks[i] == NULL will ensure that
its always null when the Log() API is called
Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/312]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
open-vm-tools/lib/misc/util_misc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git open-vm-tools/lib/misc/util_misc.c b/open-vm-tools/lib/misc/util_misc.c
index 198c23d2..0ac0a335 100644
--- open-vm-tools/lib/misc/util_misc.c
+++ open-vm-tools/lib/misc/util_misc.c
@@ -719,8 +719,8 @@ Util_ExpandString(const char *fileName) // IN file path to expand
ASSERT(!freeChunk[i]);
chunks[i] = expand;
if (chunks[i] == NULL) {
- Log("%s: Cannot allocate memory to expand \"%s\" in \"%s\".\n",
- __FUNCTION__, expand, fileName);
+ Log("%s: Cannot allocate memory to expand in \"%s\".\n",
+ __FUNCTION__, fileName);
goto out;
}
chunkSize[i] = strlen(expand);
|
