From cee17efc7c3897182765d457cce98043f7a7b94f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 1 Jul 2005 08:33:42 +0000
Subject: r8045: fix valgrind warning, add zero padding when the string doesn't
 fill the full FIXLEN

metze
(This used to be commit d8175b01db69436d8af64b97d7b7beca4ba4b552)
---
 source4/librpc/ndr/ndr_string.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c
index 134e4b8059..008b58dab9 100644
--- a/source4/librpc/ndr/ndr_string.c
+++ b/source4/librpc/ndr/ndr_string.c
@@ -435,7 +435,11 @@ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
 			return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
 					      "Bad character conversion");
 		}
-		ndr->offset += byte_mul*d_len;
+		ndr->offset += ret;
+		if ((byte_mul*d_len) > ret) {
+			uint32_t _padding_len = (byte_mul*d_len) - ret;
+			NDR_CHECK(ndr_push_zero(ndr, _padding_len));
+		}
 		break;
 
 	default:
-- 
cgit