svn commit: samba r23758 - in branches: SAMBA_3_0/source/rpc_server SAMBA_3_0_26/source/rpc_server

[vlendec at samba.org]

Author: vlendec
Date: 2007-07-09 08:04:43 +0000 (Mon, 09 Jul 2007)
New Revision: 23758

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

Log:
Fix Coverity id 385
Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
   branches/SAMBA_3_0_26/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	2007-07-09 08:00:50 UTC (rev 23757)
+++ branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2007-07-09 08:04:43 UTC (rev 23758)
@@ -7490,8 +7490,13 @@
 	/* if no hook then just fill in the default port */
 	
 	if ( !*cmd ) {
-		qlines = SMB_MALLOC_ARRAY( char*, 2 );
-		qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME );
+		if (!(qlines = SMB_MALLOC_ARRAY( char*, 2 ))) {
+			return WERR_NOMEM;
+		}
+		if (!(qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME ))) {
+			SAFE_FREE(qlines);
+			return WERR_NOMEM;
+		}
 		qlines[1] = NULL;
 		numlines = 1;
 	}

Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c	2007-07-09 08:00:50 UTC (rev 23757)
+++ branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c	2007-07-09 08:04:43 UTC (rev 23758)
@@ -7403,8 +7403,13 @@
 	/* if no hook then just fill in the default port */
 	
 	if ( !*cmd ) {
-		qlines = SMB_MALLOC_ARRAY( char*, 2 );
-		qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME );
+		if (!(qlines = SMB_MALLOC_ARRAY( char*, 2 ))) {
+			return WERR_NOMEM;
+		}
+		if (!(qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME ))) {
+			SAFE_FREE(qlines);
+			return WERR_NOMEM;
+		}
 		qlines[1] = NULL;
 		numlines = 1;
 	}