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

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  84010436579854ad9429c82c7e7050d902955344 (commit)
      from  aa4a8b4aece5b11ac4c1db87b87ebadc0a362514 (commit)

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


- Log -----------------------------------------------------------------
commit 84010436579854ad9429c82c7e7050d902955344
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 13 10:06:39 2009 -0800

    Fix Coverity IDs 879 and 880 (RESOURCE_LEAK, REVERSE_INULL)

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

Summary of changes:
 source/client/umount.cifs.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/umount.cifs.c b/source/client/umount.cifs.c
index 81925ed..1227e7a 100644
--- a/source/client/umount.cifs.c
+++ b/source/client/umount.cifs.c
@@ -240,10 +240,9 @@ static int remove_from_mtab(char * mountpoint)
 static char *
 canonicalize(char *path)
 {
-	char *canonical = malloc (PATH_MAX + 1);
+	char *canonical;
 
-	if (!canonical) {
-		fprintf(stderr, "Error! Not enough memory!\n");
+	if (path == NULL) {
 		return NULL;
 	}
 
@@ -252,8 +251,12 @@ canonicalize(char *path)
 		return NULL;
 	}
 
-	if (path == NULL)
+	canonical = (char *)malloc (PATH_MAX + 1);
+
+	if (!canonical) {
+		fprintf(stderr, "Error! Not enough memory!\n");
 		return NULL;
+	}
 
 	if (realpath (path, canonical))
 		return canonical;


-- 
Samba Shared Repository