Author: vlendec Date: 2007-08-16 12:15:52 +0000 (Thu, 16 Aug 2007) New Revision: 24485
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24485 Log: Even in the failure case unix_convert must pass the already converted part of the string to the caller. Modified: branches/SAMBA_3_2/source/smbd/filename.c branches/SAMBA_3_2_0/source/smbd/filename.c Changeset: Modified: branches/SAMBA_3_2/source/smbd/filename.c =================================================================== --- branches/SAMBA_3_2/source/smbd/filename.c 2007-08-16 10:54:11 UTC (rev 24484) +++ branches/SAMBA_3_2/source/smbd/filename.c 2007-08-16 12:15:52 UTC (rev 24485) @@ -603,8 +603,8 @@ done: result = NT_STATUS_OK; + fail: pstrcpy(orig_path, name); - fail: SAFE_FREE(name); SAFE_FREE(dirpath); return result; Modified: branches/SAMBA_3_2_0/source/smbd/filename.c =================================================================== --- branches/SAMBA_3_2_0/source/smbd/filename.c 2007-08-16 10:54:11 UTC (rev 24484) +++ branches/SAMBA_3_2_0/source/smbd/filename.c 2007-08-16 12:15:52 UTC (rev 24485) @@ -603,8 +603,8 @@ done: result = NT_STATUS_OK; + fail: pstrcpy(orig_path, name); - fail: SAFE_FREE(name); SAFE_FREE(dirpath); return result;