From a01c1968b53503594dad9c8d8817a6941a4eaeea Mon Sep 17 00:00:00 2001 From: Steve French Date: Sat, 28 Apr 2007 16:56:35 +0000 Subject: r22560: Clean up frees of realloc memory in mount.cifs (thanks to Alex for reminding me how to use Valgrind). (This used to be commit 4616c29b9f09b9863f1446e83c98e3adc327d0f9) --- source3/client/mount.cifs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/client/mount.cifs.c') diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c index 49150e1ffb..acc9f4e00e 100755 --- a/source3/client/mount.cifs.c +++ b/source3/client/mount.cifs.c @@ -618,6 +618,7 @@ static int parse_options(char ** optionsp, int * filesys_flags) nocopy: data = next_keyword; } + free(*optionsp); *optionsp = out; return 0; } @@ -1233,14 +1234,11 @@ mount_retry: } } default: - printf("mount error %d = %s\n",errno,strerror(errno)); } printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n"); - if(mountpassword) { - memset(mountpassword,0,64); - } - return -1; + rc = -1; + goto mount_exit; } else { pmntfile = setmntent(MOUNTED, "a+"); if(pmntfile) { @@ -1283,6 +1281,8 @@ mount_retry: printf("could not update mount table\n"); } } + rc = 0; +mount_exit: if(mountpassword) { int len = strlen(mountpassword); memset(mountpassword,0,len); @@ -1305,6 +1305,6 @@ mount_retry: if(free_share_name) { free(share_name); } - return 0; + return rc; } -- cgit