[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-832-g1b6543c

[Volker Lendecke]

The branch, master has been updated
       via  1b6543c5f9acea16b1ec4cf6d7c46283732b4522 (commit)
      from  5cd4b7b7c03df6e896186d985b6858a06aa40b3f (commit)

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


- Log -----------------------------------------------------------------
commit 1b6543c5f9acea16b1ec4cf6d7c46283732b4522
Author: Volker Lendecke <v...@samba.org>
Date:   Thu Feb 12 22:58:24 2009 +0100

    Fix Coverity IDs 879 and 880 (RESOURCE_LEAK, REVERSE_INULL)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/client/umount.cifs.c b/source3/client/umount.cifs.c
index 81925ed..1227e7a 100644
--- a/source3/client/umount.cifs.c
+++ b/source3/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