[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-27-g661f0ba

[Jeremy Allison]

The branch, master has been updated
       via  661f0ba73b28d6165e0ba958413adf9cb97662d5 (commit)
      from  271d09f5992bdfe1eba6cfb39563cc899eeda178 (commit)

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


- Log -----------------------------------------------------------------
commit 661f0ba73b28d6165e0ba958413adf9cb97662d5
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jun 19 17:26:53 2009 -0700

    Fix coverity #729. Resource leak in error path.
    Jeremy.

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

Summary of changes:
 source3/client/client.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index 36a70d0..ed45f4e 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1666,6 +1666,7 @@ static int do_put(const char *rname, const char *lname, bool reput)
 		if (f && reput) {
 			if (x_tseek(f, start, SEEK_SET) == -1) {
 				d_printf("Error seeking local file\n");
+				x_fclose(f);
 				return 1;
 			}
 		}
@@ -1692,7 +1693,9 @@ static int do_put(const char *rname, const char *lname, bool reput)
 
 	if (!NT_STATUS_IS_OK(cli_close(targetcli, fnum))) {
 		d_printf("%s closing remote file %s\n",cli_errstr(cli),rname);
-		x_fclose(f);
+		if (f != x_stdin) {
+			x_fclose(f);
+		}
 		return 1;
 	}
 


-- 
Samba Shared Repository