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:
authorMichael Veksler <Mihails.Vekslers@zabbix.com>2021-11-01 12:50:57 +0300
committerMichael Veksler <Mihails.Vekslers@zabbix.com>2021-11-01 12:53:49 +0300
commit9c1152945ffc50fa1813fed9d25c0bd240d66994 (patch)
treed59d9dfc3cc2b4165985e9e9820626f502b48dc8
parent0244493081b1c42b32a6f93f3f6da4a26a2b88da (diff)
.......PS. [ZBX-20032] fixed server crash when restarting monitored vmware vc
* commit '0814d677cc93ea385ba1ff3d1a8b48af8336aa7e': .......PS. [ZBX-20032] fixed server crash when restarting monitored vmware vc (cherry picked from commit 6298255be72a0184eb4b942a5dd7361332b03ad4) (cherry picked from commit 6638d158914366c89562f6eb02b9ab5534297878)
-rw-r--r--ChangeLog.d/bugfix/ZBX-200321
-rw-r--r--src/zabbix_server/vmware/vmware.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-20032 b/ChangeLog.d/bugfix/ZBX-20032
new file mode 100644
index 00000000000..a8d984a2e98
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20032
@@ -0,0 +1 @@
+.......PS. [ZBX-20032] fixed server crash when restarting monitored vmware vc (MVekslers)
diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c
index 228065a9b4d..e0f3471d6b1 100644
--- a/src/zabbix_server/vmware/vmware.c
+++ b/src/zabbix_server/vmware/vmware.c
@@ -2244,6 +2244,12 @@ static int vmware_service_get_contents(CURL *easyhandle, char **version, char **
*fullname = zbx_xml_read_doc_value(doc, ZBX_XPATH_VMWARE_ABOUT("fullName"));
zbx_xml_free_doc(doc);
+ if (NULL == *version)
+ {
+ *error = zbx_strdup(*error, "VMware Virtual Center is not ready.");
+ return FAIL;
+ }
+
return SUCCEED;
# undef ZBX_POST_VMWARE_CONTENTS