Hans Leidekker : advapi32: Avoid a crash when storing credentials on MacOS.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 8694d95bae9a30bf98076c05afddd51e0df4a3f8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8694d95bae9a30bf98076c05af...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Thu Dec 19 13:36:47 2013 +0100

advapi32: Avoid a crash when storing credentials on MacOS.

(cherry picked from commit 2f3c474e413b237271911d615630b7a2be26b7c3)

---

 dlls/advapi32/cred.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c
index 58dd72d..e0f86af 100644
--- a/dlls/advapi32/cred.c
+++ b/dlls/advapi32/cred.c
@@ -571,7 +571,7 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b
 
     TRACE("adding server %s, domain %s, username %s using Keychain\n", servername, domain, username);
     status = SecKeychainAddInternetPassword(NULL, strlen(servername), servername,
-                                            strlen(domain), domain, strlen(username),
+                                            domain ? strlen(domain) : 0, domain, strlen(username),
                                             username, 0, NULL, 0,
                                             0 /* no protocol */,
                                             kSecAuthenticationTypeDefault,
@@ -583,7 +583,7 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b
         SecKeychainItemRef keychain_item;
 
         status = SecKeychainFindInternetPassword(NULL, strlen(servername), servername,
-                                                 strlen(domain), domain,
+                                                 domain ? strlen(domain) : 0, domain,
                                                  strlen(username), username,
                                                  0, NULL /* any path */, 0,
                                                  0 /* any protocol */,