Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksejs Sestakovs <aleksejs.sestakovs@zabbix.com>2022-10-28 13:17:57 +0300
committerAleksejs Sestakovs <aleksejs.sestakovs@zabbix.com>2022-10-28 13:17:57 +0300
commit2e1ad69f73c0bdc46808d9d48f025657b2c92bda (patch)
tree4e3483ff6b04fdcbef6c5da78dd8461615bf8070
parenta4dc08a8628214aa9ae5b8fee4d80d4b2e0ca208 (diff)
...G...... [ZBX-21689] fixed proc.num to not crash agent on Windows when 'user' parameter is set
-rw-r--r--ChangeLog.d/bugfix/ZBX-216891
-rw-r--r--src/libs/zbxsysinfo/win32/proc.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21689 b/ChangeLog.d/bugfix/ZBX-21689
new file mode 100644
index 00000000000..0a25ef361b5
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21689
@@ -0,0 +1 @@
+...G...... [ZBX-21689] fixed proc.num to not crash agent on Windows when 'user' parameter is set (asestakovs)
diff --git a/src/libs/zbxsysinfo/win32/proc.c b/src/libs/zbxsysinfo/win32/proc.c
index 4c3031cc838..705aa4e88df 100644
--- a/src/libs/zbxsysinfo/win32/proc.c
+++ b/src/libs/zbxsysinfo/win32/proc.c
@@ -73,7 +73,10 @@ static int zbx_get_process_username(HANDLE hProcess, char *userName, char *sid)
int iUse, res = FAIL;
/* clean result; */
- *userName = *sid = '\0';
+ *userName = '\0';
+
+ if (NULL != sid)
+ *sid = '\0';
/* open the processes token */
if (0 == OpenProcessToken(hProcess, TOKEN_QUERY, &tok))