From: Jeremy Allison <jra@samba.org>
Date: Tue, 9 Feb 2010 22:56:12 +0000 (-0800)
Subject: Missed one check on the memcpy for bug #7063.
X-Git-Tag: samba-3.6.0pre1~5488
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a056eb85ff8cabc05970c789abba890d914e7ecb;p=thirdparty%2Fsamba.git

Missed one check on the memcpy for bug #7063.

Jeremy.
---

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 33d47df33aa..7a4c9c92638 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -9455,7 +9455,7 @@ WERROR _spoolss_XcvData(pipes_struct *p,
 
 	*r->out.status_code = 0;
 
-	if (r->out.out_data && r->in.out_data_size && out_data.length) {
+	if (r->out.out_data && out_data.data && r->in.out_data_size && out_data.length) {
 		memcpy(r->out.out_data, out_data.data,
 			MIN(r->in.out_data_size, out_data.length));
 	}