summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-08-02 23:23:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:00:22 -0500
commit4ff44ae90e59d305bb765c88327a3d3292bafb35 (patch)
treec1b9ca3f2052b846304a19750a067cd7a4b83c34
parenta4cdedcc085e0b9a94e6757a9b427af503ad6593 (diff)
downloadsamba-4ff44ae90e59d305bb765c88327a3d3292bafb35.tar.gz
samba-4ff44ae90e59d305bb765c88327a3d3292bafb35.tar.bz2
samba-4ff44ae90e59d305bb765c88327a3d3292bafb35.zip
r8956: fix segfault caused by trying to parse a UNISTR2
and not a UNISTR2* (This used to be commit f775fc7209da9e11768625f4084297aa16c9a4d1)
-rw-r--r--source3/rpc_parse/parse_svcctl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c
index 77b48fd0ee..b86ca23df1 100644
--- a/source3/rpc_parse/parse_svcctl.c
+++ b/source3/rpc_parse/parse_svcctl.c
@@ -808,8 +808,10 @@ BOOL svcctl_io_r_query_service_config2(const char *desc, SVCCTL_R_QUERY_SERVICE_
if (r_u->returned > 4) {
if (!prs_uint32("offset", ps, depth, &r_u->offset))
return False;
- if(!prs_unistr2(True, "description ", ps, depth, r_u->description))
+
+ if ( !prs_pointer( desc, ps, depth, (void**)&r_u->description, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2 ) )
return False;
+
if(!prs_align(ps))
return False;
} else {