[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  a056eb8... Missed one check on the memcpy for bug #7063.
      from  539bbf8... Second part of fix for bug 7063 - Samba 3.4.5 on ubuntu 8.04 64 bit - Core dumps.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a056eb85ff8cabc05970c789abba890d914e7ecb
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 9 14:56:12 2010 -0800

    Missed one check on the memcpy for bug #7063.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 33d47df..7a4c9c9 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));
 	}


-- 
Samba Shared Repository