svn commit: samba r9040 - branches/SAMBA_3_0/source/rpc_client trunk/source/rpc_client

[jerry at samba.org]

Author: jerry
Date: 2005-08-04 03:11:02 +0000 (Thu, 04 Aug 2005)
New Revision: 9040

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

Log:
revert pointer checks that I had removed; fixes crash in calls to enumprinterdata()
Modified:
   branches/SAMBA_3_0/source/rpc_client/cli_spoolss.c
   trunk/source/rpc_client/cli_spoolss.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_client/cli_spoolss.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_client/cli_spoolss.c	2005-08-04 03:04:58 UTC (rev 9039)
+++ branches/SAMBA_3_0/source/rpc_client/cli_spoolss.c	2005-08-04 03:11:02 UTC (rev 9040)
@@ -1586,9 +1586,11 @@
 	            spoolss_io_q_enumprinterdata,
 	            spoolss_io_r_enumprinterdata, 
 	            WERR_GENERAL_FAILURE );
-		    
-	*value_needed = out.realvaluesize;
-	*data_needed = out.realdatasize;
+
+	if ( value_needed )
+		*value_needed = out.realvaluesize;
+	if ( data_offered )
+		*data_needed = out.realdatasize;
 		
 	if (!W_ERROR_IS_OK(out.status))
 		return out.status;

Modified: trunk/source/rpc_client/cli_spoolss.c
===================================================================
--- trunk/source/rpc_client/cli_spoolss.c	2005-08-04 03:04:58 UTC (rev 9039)
+++ trunk/source/rpc_client/cli_spoolss.c	2005-08-04 03:11:02 UTC (rev 9040)
@@ -1586,9 +1586,11 @@
 	            spoolss_io_q_enumprinterdata,
 	            spoolss_io_r_enumprinterdata, 
 	            WERR_GENERAL_FAILURE );
-		    
-	*value_needed = out.realvaluesize;
-	*data_needed = out.realdatasize;
+
+	if ( value_needed )
+		*value_needed = out.realvaluesize;
+	if ( data_offered )
+		*data_needed = out.realdatasize;
 		
 	if (!W_ERROR_IS_OK(out.status))
 		return out.status;