r20361: Prevent strnlen_w reading beyond max. Valgrind

found by Volker.
Jeremy

diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c
index 84e4cf3f83ef62c131ee2b63173cca79275a135b..cf040a2dfc096b96da6038544e993b97974fecf7 100644 (file)
--- a/source/lib/util_unistr.c
+++ b/source/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++) {
                ;
        }