The branch, v3-4-test has been updated
via 1e117c6ebc6322b7fac4928d84bc5e714e559ea5 (commit)
from 265e1fca1228776a0a7556ef854bfcc4130085b4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 1e117c6ebc6322b7fac4928d84bc5e714e559ea5
Author: Günther Deschner <[email protected]>
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
(cherry picked from commit dd33abf649f4e1479365a2ccc2b41134270ff4ac)
-----------------------------------------------------------------------
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 f88801e..d40ae49 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
