From: Derrell Lipman <derrell.lipman@unwireduniverse.com>
Date: Thu, 6 Mar 2008 14:00:37 +0000 (-0500)
Subject: Check for NULL pointers before dereferencing them.
X-Git-Tag: samba-3.3.0pre1~3412
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f65390cec218a6aac4370ee381f30439617dcec;p=thirdparty%2Fsamba.git

Check for NULL pointers before dereferencing them.
---

diff --git a/source/libsmb/libsmb_server.c b/source/libsmb/libsmb_server.c
index 64eb1ea5841..37612c6e39f 100644
--- a/source/libsmb/libsmb_server.c
+++ b/source/libsmb/libsmb_server.c
@@ -144,6 +144,10 @@ SMBC_find_server(TALLOC_CTX *ctx,
         SMBCSRV *srv;
         int auth_called = 0;
         
+        if (!pp_workgroup || !pp_username || !pp_password) {
+                return NULL;
+        }
+                
 check_server_cache:
         
 	srv = smbc_getFunctionGetCachedServer(context)(context,
@@ -156,10 +160,6 @@ check_server_cache:
 		SMBC_call_auth_fn(ctx, context, server, share,
                                   pp_workgroup, pp_username, pp_password);
                 
-		if (!pp_workgroup || !pp_username || !pp_password) {
-			return NULL;
-		}
-                
 		/*
                  * However, smbc_auth_fn may have picked up info relating to
                  * an existing connection, so try for an existing connection