From bc112cc46d9dacf2d1cb105d99e1e01ec38c5fa6 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 27 Dec 2006 18:36:00 +0000
Subject: r20361: Prevent strnlen_w reading beyond max. Valgrind found by
 Volker. Jeremy (This used to be commit
 08d551163c9563bd02acd437bc1a1595e7939cee)

---
 source3/lib/util_unistr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/util_unistr.c')

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 84e4cf3f83..cf040a2dfc 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -484,7 +484,7 @@ size_t strnlen_w(const smb_ucs2_t *src, size_t max)
 	size_t len;
 	smb_ucs2_t c;
 
-	for(len = 0; *(COPY_UCS2_CHAR(&c,src)) && (len < max); src++, len++) {
+	for(len = 0; (len < max) && *(COPY_UCS2_CHAR(&c,src)); src++, len++) {
 		;
 	}
 
-- 
cgit