svn commit: samba r8045 - in branches/SAMBA_4_0/source/librpc/ndr: .

[metze at samba.org]

Author: metze
Date: 2005-07-01 08:33:42 +0000 (Fri, 01 Jul 2005)
New Revision: 8045

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8045

Log:
fix valgrind warning, add zero padding when the string doesn't fill the full FIXLEN

metze
Modified:
   branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2005-07-01 08:27:23 UTC (rev 8044)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2005-07-01 08:33:42 UTC (rev 8045)
@@ -435,7 +435,11 @@
 			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: