]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Check for NULL before calling strcmp().
authorVMware, Inc <>
Tue, 13 Mar 2012 20:08:42 +0000 (13:08 -0700)
committerDmitry Torokhov <dtor@vmware.com>
Wed, 14 Mar 2012 16:04:59 +0000 (09:04 -0700)
In few code paths, we pass NULL value to the strcmp() functions which
may result in a crash. Modified the code to implement NULL checks
before calling strcmp() function.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
open-vm-tools/services/plugins/vix/vixTools.c

index 3f6bf5d6462297b7af5d58e8938861e1541cae0a..459c9172d0fd1968004a6964de34652cc5b68c15 100644 (file)
@@ -2568,11 +2568,13 @@ VixToolsGetAPIDisabledFromConf(GKeyFile *confDictRef,            // IN
    /*
     * Make sure vgauth related stuff does not show as enabled.
     */
-   if ((strcmp(varName, VIX_TOOLS_CONFIG_API_ADD_AUTH_PRINCIPAL_NAME) == 0) ||
-       (strcmp(varName, VIX_TOOLS_CONFIG_API_REMOVE_AUTH_PRINCIPAL_NAME) == 0) ||
-       (strcmp(varName, VIX_TOOLS_CONFIG_API_LIST_AUTH_PRINCIPALS_NAME) == 0) ||
-       (strcmp(varName, VIX_TOOLS_CONFIG_API_LIST_MAPPED_PRINCIPALS_NAME) == 0)) {
-      disabled = TRUE;
+   if (NULL != varName) {
+      if ((strcmp(varName, VIX_TOOLS_CONFIG_API_ADD_AUTH_PRINCIPAL_NAME) == 0) ||
+          (strcmp(varName, VIX_TOOLS_CONFIG_API_REMOVE_AUTH_PRINCIPAL_NAME) == 0) ||
+          (strcmp(varName, VIX_TOOLS_CONFIG_API_LIST_AUTH_PRINCIPALS_NAME) == 0) ||
+          (strcmp(varName, VIX_TOOLS_CONFIG_API_LIST_MAPPED_PRINCIPALS_NAME) == 0)) {
+         disabled = TRUE;
+      }
    }
 #endif