gcapi mac: If a system ticket points to a nonexistent folder, also set 'access denied'.

That way, installers can opt to not call LaunchGoogleChrome() for
system installs.

Also add a few null checks if getting the effective user fails.

BUG=none

Review URL: https://codereview.chromium.org/11308079

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168329 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/chrome/installer/gcapi_mac/gcapi.mm b/chrome/installer/gcapi_mac/gcapi.mm
index 9540966..e2f9e6a 100644
--- a/chrome/installer/gcapi_mac/gcapi.mm
+++ b/chrome/installer/gcapi_mac/gcapi.mm
@@ -315,12 +315,18 @@ int GoogleChromeCompatibilityCheck(unsigned* reasons) {
   unsigned local_reasons = 0;
   @autoreleasepool {
     passwd* user = GetRealUserId();
+    if (!user)
+      return GCCC_ERROR_ACCESSDENIED;
 
     if (!IsOSXVersionSupported())
       local_reasons |= GCCC_ERROR_OSNOTSUPPORTED;
 
-    if (FindChromeTicket(kSystemTicket, NULL, NULL))
+    NSString* path;
+    if (FindChromeTicket(kSystemTicket, NULL, &path)) {
       local_reasons |= GCCC_ERROR_ALREADYPRESENT;
+      if (!path)  // Ticket points to nothingness.
+        local_reasons |= GCCC_ERROR_ACCESSDENIED;
+    }
 
     if (FindChromeTicket(kUserTicket, user, NULL))
       local_reasons |= GCCC_ERROR_ALREADYPRESENT;
@@ -345,6 +351,8 @@ int InstallGoogleChrome(const char* source_path,
 
   @autoreleasepool {
     passwd* user = GetRealUserId();
+    if (!user)
+      return 0;
 
     NSString* app_path = [NSString stringWithUTF8String:source_path];
     NSString* info_plist_path =
@@ -403,6 +411,8 @@ int InstallGoogleChrome(const char* source_path,
 int LaunchGoogleChrome() {
   @autoreleasepool {
     passwd* user = GetRealUserId();
+    if (!user)
+      return 0;
 
     NSString* app_path;