From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 19 Feb 2010 07:11:24 +0000 (+0100)
Subject: librpc/ndr: don't overwrite the content in ndr_push_relative_ptr2_end()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58b089f2176e564bf5563fbffa034cd22525ed6e;p=thirdparty%2Fsamba.git

librpc/ndr: don't overwrite the content in ndr_push_relative_ptr2_end()

metze
(cherry picked from commit 76aa37f653fec2d511921768381db7da661750cb)

The last 25 patches address bug #6888 (REGRESSION: printing support for 64 bit
windows clients broken).
---

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index ab4168a0f94..7d91d23eb81 100644
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -1171,11 +1171,17 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, cons
 	}
 
 	if (len > 0) {
+		uint32_t clear_size = correct_offset - begin_offset;
+
+		clear_size = MIN(clear_size, len);
+
 		/* now move the marshalled buffer to the end of the main buffer */
 		memmove(ndr->data + correct_offset, ndr->data + begin_offset, len);
 
-		/* and wipe out old buffer within the main buffer */
-		memset(ndr->data + begin_offset, '\0', len);
+		if (clear_size) {
+			/* and wipe out old buffer within the main buffer */
+			memset(ndr->data + begin_offset, '\0', clear_size);
+		}
 	}
 
 	/* and set the end offset for the next buffer */