diff options
| author | Günther Deschner <gd@samba.org> | 2009-12-16 22:54:02 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-02-19 14:32:30 +0100 |
| commit | b6774912f44d143cfabc6482ad0c1316a5749c83 (patch) | |
| tree | 03fc87d8425d2076017d2a093dd2685f5dc0d9bd | |
| parent | bec6240702952308296b833b862ae5e93b862259 (diff) | |
| download | samba-b6774912f44d143cfabc6482ad0c1316a5749c83.tar.gz | |
libndr: change subcontext buffer allocation to allocate on subcontext_start.
Guenther
(cherry picked from commit c9fa97b01774d767acfabaf1eec7a6aad1510440)
(cherry picked from commit 07a51577816e493c04f0fa7baaf798e9455d923f)
| -rw-r--r-- | librpc/ndr/ndr.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 400045f5d04..2df406318c3 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -590,6 +590,11 @@ _PUBLIC_ enum ndr_err_code ndr_push_subcontext_start(struct ndr_push *ndr, NDR_ERR_HAVE_NO_MEMORY(subndr); subndr->flags = ndr->flags & ~LIBNDR_FLAG_NDR64; + if (size_is > 0) { + NDR_CHECK(ndr_push_zero(subndr, size_is)); + subndr->offset = 0; + } + *_subndr = subndr; return NDR_ERR_SUCCESS; } @@ -606,12 +611,11 @@ _PUBLIC_ enum ndr_err_code ndr_push_subcontext_end(struct ndr_push *ndr, if (size_is >= 0) { padding_len = size_is - subndr->offset; - if (padding_len > 0) { - NDR_CHECK(ndr_push_zero(subndr, padding_len)); - } else if (padding_len < 0) { + if (padding_len < 0) { return ndr_push_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PUSH) content_size %d is larger than size_is(%d)", (int)subndr->offset, (int)size_is); } + subndr->offset = size_is; } switch (header_size) { |