From 8623c981b4a67dafc19234faffced1796f33b975 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 21 Jan 2008 20:56:27 +1100 Subject: Be sure to pass iconv handle down to compression subcontexts (fixes segfaults in NET-API-BECOME-DC) Andrew Bartlett (This used to be commit 70c1e918e6bd01946425e2d89cb680f14152f9fc) --- source4/librpc/ndr/ndr_compression.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source4/librpc/ndr') diff --git a/source4/librpc/ndr/ndr_compression.c b/source4/librpc/ndr/ndr_compression.c index 310f8c4ce4..86a5a2560e 100644 --- a/source4/librpc/ndr/ndr_compression.c +++ b/source4/librpc/ndr/ndr_compression.c @@ -112,6 +112,8 @@ static enum ndr_err_code ndr_pull_compression_mszip(struct ndr_pull *subndr, comndr->data_size = uncompressed.length; comndr->offset = 0; + comndr->iconv_convenience = talloc_reference(comndr, subndr->iconv_convenience); + NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[0])); NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[1])); NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[2])); @@ -215,6 +217,8 @@ static enum ndr_err_code ndr_pull_compression_xpress(struct ndr_pull *subndr, comndr->data_size = uncompressed.length; comndr->offset = 0; + comndr->iconv_convenience = talloc_reference(comndr, subndr->iconv_convenience); + *_comndr = comndr; return NDR_ERR_SUCCESS; } -- cgit