From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 2 Aug 2019 18:07:19 +0000 (-0700)
Subject: Fix two issues reported by Coverity in vixTools.c:
X-Git-Tag: stable-11.1.0~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30de81b2713603e3a7e7d9ec5491240c1265c7bc;p=thirdparty%2Fopen-vm-tools.git

Fix two issues reported by Coverity in vixTools.c:

 - a superfluous NULL pointer check in VixToolsRunScript
 - a potential NULL pointer dereference in VixToolsValidateCredentials
---

diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index 780729c2b..372b4639c 100644
--- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -7684,7 +7684,7 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,  // IN
       goto abort;
    }
 
-   if ((NULL != interpreterName) && (*interpreterName)) {
+   if (*interpreterName) {
       fullCommandLine = Str_SafeAsprintf(NULL, // resulting string length
                                      "\"%s\" %s \"%s\"",
                                      interpreterName,
@@ -9098,29 +9098,14 @@ abort:
 VixError
 VixToolsValidateCredentials(VixCommandRequestHeader *requestMsg)    // IN
 {
-   VixError err = VIX_OK;
+   VixError err;
    void *userToken = NULL;
-   Bool impersonatingVMWareUser = FALSE;
-
-   if (NULL == requestMsg) {
-      ASSERT(0);
-      err = VIX_E_FAIL;
-      goto abort;
-   }
 
    err = VixToolsImpersonateUser((VixCommandRequestHeader *) requestMsg,
                                  TRUE,
                                  &userToken);
-   if (VIX_OK != err) {
-      goto abort;
-   }
-   impersonatingVMWareUser = TRUE;
-
-   g_debug("%s: User: %s\n",
-           __FUNCTION__, IMPERSONATED_USERNAME);
-
-abort:
-   if (impersonatingVMWareUser) {
+   if (VIX_OK == err) {
+      g_debug("%s: User: %s\n", __FUNCTION__, IMPERSONATED_USERNAME);
       VixToolsUnimpersonateUser(userToken);
    }
    VixToolsLogoutUser(userToken);