diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-15 14:36:13 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-15 14:36:13 +1000 |
| commit | 4678d1c6f4de1af9144de37d6d4b35c6c39e254d (patch) | |
| tree | 94e58cf112ef34412bc5521f4bc9f56424ee967f /source3/rpc_server/srv_svcctl_nt.c | |
| parent | 86b50a0e6eacc14e157602811f30f11dccc471a8 (diff) | |
| parent | 92d321006d1748ac47cf9b52330212f4ae03f502 (diff) | |
| download | samba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.tar.gz samba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.tar.bz2 samba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge-without-netlogond
Diffstat (limited to 'source3/rpc_server/srv_svcctl_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_svcctl_nt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c index 0b0ef83bee..d73f73f9ec 100644 --- a/source3/rpc_server/srv_svcctl_nt.c +++ b/source3/rpc_server/srv_svcctl_nt.c @@ -464,9 +464,8 @@ WERROR _svcctl_EnumServicesStatusW(pipes_struct *p, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return ntstatus_to_werror(ndr_map_error2ntstatus(ndr_err)); } - blob = ndr_push_blob(ndr); - memcpy(r->out.service, blob.data, r->in.offered); + memcpy(r->out.service, blob.data, MIN(blob.length, r->in.offered)); } *r->out.needed = (buffer_size > r->in.offered) ? buffer_size : r->in.offered; |