[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2627-gac0c2fb

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  ac0c2fb6e8c3d1b14a6e7490857a414a5fac6bb5 (commit)
      from  201bcc8ed291b51be6f4508c6aa1cb17ce6dcbe3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit ac0c2fb6e8c3d1b14a6e7490857a414a5fac6bb5
Author: Jeremy Allison <jra at samba.org>
Date:   Tue May 27 13:56:55 2008 -0700

    A few cleanups from Chere Zhou <chere.zhou at isilon.com>.
    Jeremy.
    
    Conflicts:
    
    	source/utils/net_rap.c
    	source/utils/net_rpc.c

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

Summary of changes:
 source/utils/net_rap.c |    2 ++
 source/utils/net_rpc.c |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net_rap.c b/source/utils/net_rap.c
index f50b579..449bec6 100644
--- a/source/utils/net_rap.c
+++ b/source/utils/net_rap.c
@@ -221,6 +221,7 @@ static int rap_share_add(struct net_context *c, int argc, const char **argv)
 	p = strchr(sharename, '=');
 	if (p == NULL) {
 		d_printf("Server path not specified\n");
+		SAFE_FREE(sharename);
 		return net_rap_share_usage(c, argc, argv);
 	}
 	*p = 0;
@@ -237,6 +238,7 @@ static int rap_share_add(struct net_context *c, int argc, const char **argv)
 
 	ret = cli_NetShareAdd(cli, &sinfo);
 	cli_shutdown(cli);
+	SAFE_FREE(sharename);
 	return ret;
 }
 
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 3779611..d6a3e48 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -3732,6 +3732,10 @@ static NTSTATUS rpc_share_migrate_files_internals(struct net_context *c,
 	char *dst = NULL;
 
 	dst = SMB_STRDUP(c->opt_destination?c->opt_destination:"127.0.0.1");
+	if (dst == NULL) {
+		nt_status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
 
 	result = get_share_info(c, pipe_hnd, mem_ctx, level, argc, argv,
 				&ctr_src);
@@ -3817,6 +3821,7 @@ done:
 	if (got_dst_share)
 		cli_shutdown(cp_clistate.cli_share_dst);
 
+	SAFE_FREE(dst);
 	return nt_status;
 
 }


-- 
Samba Shared Repository