[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-360-g8afd835

[Volker Lendecke]

The branch, master has been updated
       via  8afd835cea1a8138a4e21702e610b0b0e9904700 (commit)
      from  5fa4cf283f3f8bcf3c3399882f2e08ef902424c5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8afd835cea1a8138a4e21702e610b0b0e9904700
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 15 11:58:07 2009 +0100

    Fix a malloc/talloc mismatch when cli_initialise() fails

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/clientgen.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 295ccae..c1ba4e5 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -493,8 +493,7 @@ struct cli_state *cli_initialise_ex(int signing_state)
 
 	cli->dfs_mountpoint = talloc_strdup(cli, "");
 	if (!cli->dfs_mountpoint) {
-		TALLOC_FREE(cli);
-		return NULL;
+		goto error;
 	}
 	cli->port = 0;
 	cli->fd = -1;
@@ -571,7 +570,7 @@ struct cli_state *cli_initialise_ex(int signing_state)
 
         SAFE_FREE(cli->inbuf);
         SAFE_FREE(cli->outbuf);
-	SAFE_FREE(cli);
+	TALLOC_FREE(cli);
         return NULL;
 }
 


-- 
Samba Shared Repository