[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1294-gdd33abf

[Günther Deschner]

The branch, master has been updated
       via  dd33abf649f4e1479365a2ccc2b41134270ff4ac (commit)
      from  6af92c022865412a7447b1f2ef9828a57199fce0 (commit)

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


- Log -----------------------------------------------------------------
commit dd33abf649f4e1479365a2ccc2b41134270ff4ac
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 28 01:08:31 2009 +0200

    s3-svcctl: Fix crash in _svcctl_EnumServicesStatusW().
    
    The resume handle is a unique pointer, always check before dereference.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index f5b7b61..f393a9a 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -470,7 +470,9 @@ WERROR _svcctl_EnumServicesStatusW(pipes_struct *p,
 
 	*r->out.needed			= (buffer_size > r->in.offered) ? buffer_size : r->in.offered;
 	*r->out.services_returned	= (uint32)num_services;
-	*r->out.resume_handle		= 0x0;
+	if (r->out.resume_handle) {
+		*r->out.resume_handle	= 0;
+	}
 
 	return result;
 }


-- 
Samba Shared Repository