svn commit: samba r14289 - in branches/SAMBA_3_0/source/rpc_server: .

jra at samba.org jra at samba.org
Mon Mar 13 04:05:49 GMT 2006


Author: jra
Date: 2006-03-13 04:05:47 +0000 (Mon, 13 Mar 2006)
New Revision: 14289

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

Log:
Fix coverity #101, resource leak on error code path.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2006-03-13 04:04:38 UTC (rev 14288)
+++ branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2006-03-13 04:05:47 UTC (rev 14289)
@@ -7046,12 +7046,17 @@
 	DEBUGADD(5,("Number of user forms [%d]\n",     *numofforms));
 	*numofforms += numbuiltinforms;
 
-	if (*numofforms == 0) 
+	if (*numofforms == 0) {
+		SAFE_FREE(builtinlist);
+		SAFE_FREE(list);
 		return WERR_NO_MORE_ITEMS;
+	}
 
 	switch (level) {
 	case 1:
 		if ((forms_1=SMB_MALLOC_ARRAY(FORM_1, *numofforms)) == NULL) {
+			SAFE_FREE(builtinlist);
+			SAFE_FREE(list);
 			*numofforms=0;
 			return WERR_NOMEM;
 		}
@@ -7114,7 +7119,6 @@
 		SAFE_FREE(builtinlist);
 		return WERR_UNKNOWN_LEVEL;
 	}
-
 }
 
 /****************************************************************************



More information about the samba-cvs mailing list