From: Ben Laurie <ben@links.org>
Date: Thu, 22 May 2014 09:11:40 +0000 (+0100)
Subject: Check length first in BUF_strnlen().
X-Git-Tag: master-post-reformat~789
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb33348879938a073a9941e4ca21da21a27e04df;p=oweals%2Fopenssl.git

Check length first in BUF_strnlen().
---

diff --git a/crypto/buffer/buf_str.c b/crypto/buffer/buf_str.c
index 35e4a2e789..b4ff71ed5a 100644
--- a/crypto/buffer/buf_str.c
+++ b/crypto/buffer/buf_str.c
@@ -66,7 +66,7 @@ size_t BUF_strnlen(const char *str, size_t maxlen)
 	{
 	const char *p;
 
-	for (p = str; *p != '\0' && maxlen-- != 0; ++p)
+	for (p = str; maxlen-- != 0 && *p != '\0'; ++p)
 		;
 
 	return p - str;