[SCM] Samba Shared Repository - branch v3-4-test updated -
release-4-0-0alpha7-357-g6845613
Volker Lendecke
vlendec at samba.org
Sun Mar 15 11:03:16 GMT 2009
The branch, v3-4-test has been updated
via 68456130ff23cb8139c9710fc674ca5b52230197 (commit)
from 8e945ea3c2ba46c0716c984766b4d8cc252c4004 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 68456130ff23cb8139c9710fc674ca5b52230197
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
More information about the samba-cvs
mailing list