svn commit: samba r14287 - in trunk/source/rpc_server: .

[jra at samba.org]

Author: jra
Date: 2006-03-13 03:59:58 +0000 (Mon, 13 Mar 2006)
New Revision: 14287

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

Log:
Similar clarifiction fix for coverity #102.
Jeremy.

Modified:
   trunk/source/rpc_server/srv_spoolss_nt.c


Changeset:
Modified: trunk/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- trunk/source/rpc_server/srv_spoolss_nt.c	2006-03-13 03:59:53 UTC (rev 14286)
+++ trunk/source/rpc_server/srv_spoolss_nt.c	2006-03-13 03:59:58 UTC (rev 14287)
@@ -7288,8 +7288,8 @@
 	PORT_INFO_1 *ports=NULL;
 	int i=0;
 	WERROR result = WERR_OK;
-	char **qlines;
-	int numlines;
+	char **qlines = NULL;
+	int numlines = 0;
 
 	result = enumports_hook( &numlines, &qlines );
 	if (!W_ERROR_IS_OK(result)) {
@@ -7354,13 +7354,15 @@
 	PORT_INFO_2 *ports=NULL;
 	int i=0;
 	WERROR result = WERR_OK;
-	char **qlines;
-	int numlines;
+	char **qlines = NULL;
+	int numlines = 0;
 
-	if ( !W_ERROR_IS_OK(result = enumports_hook( &numlines, &qlines )) ) 
+	result = enumports_hook( &numlines, &qlines );
+	if ( !W_ERROR_IS_OK(result)) {
+		file_lines_free(qlines);
 		return result;
+	}
 	
-	
 	if(numlines) {
 		if((ports=SMB_MALLOC_ARRAY( PORT_INFO_2, numlines)) == NULL) {
 			file_lines_free(qlines);
@@ -7371,10 +7373,10 @@
 			DEBUG(6,("Filling port number [%d] with port [%s]\n", i, qlines[i]));
 			fill_port_2(&(ports[i]), qlines[i]);
 		}
-
-		file_lines_free(qlines);
 	}
 
+	file_lines_free(qlines);
+
 	*returned = numlines;
 
 	/* check the required size. */