svn commit: samba r23879 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-07-15 09:42:43 +0000 (Sun, 15 Jul 2007)
New Revision: 23879

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23879

Log:
Fix two memleaks, found by the IBM checker

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-07-15 09:40:00 UTC (rev 23878)
+++ branches/SAMBA_3_2/source/smbd/filename.c	2007-07-15 09:42:43 UTC (rev 23879)
@@ -237,10 +237,12 @@
 		if (p) {
 			if (p[2] == '/') {
 				/* Error code within a pathname. */
-				return NT_STATUS_OBJECT_PATH_NOT_FOUND;
+				result = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+				goto fail;
 			} else if (p[2] == '\0') {
 				/* Error code at the end of a pathname. */
-				return NT_STATUS_OBJECT_NAME_INVALID;
+				result = NT_STATUS_OBJECT_NAME_INVALID;
+				goto fail;
 			}
 		}
 		stat_cache_add(orig_path, name, conn->case_sensitive);

Modified: branches/SAMBA_3_2_0/source/smbd/filename.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/filename.c	2007-07-15 09:40:00 UTC (rev 23878)
+++ branches/SAMBA_3_2_0/source/smbd/filename.c	2007-07-15 09:42:43 UTC (rev 23879)
@@ -237,10 +237,12 @@
 		if (p) {
 			if (p[2] == '/') {
 				/* Error code within a pathname. */
-				return NT_STATUS_OBJECT_PATH_NOT_FOUND;
+				result = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+				goto fail;
 			} else if (p[2] == '\0') {
 				/* Error code at the end of a pathname. */
-				return NT_STATUS_OBJECT_NAME_INVALID;
+				result = NT_STATUS_OBJECT_NAME_INVALID;
+				goto fail;
 			}
 		}
 		stat_cache_add(orig_path, name, conn->case_sensitive);