From: Willy Tarreau <w@1wt.eu>
Date: Thu, 25 Oct 2007 07:42:24 +0000 (+0200)
Subject: [BUG] fix error checking in strl2ic/strl2uic()
X-Git-Tag: v1.3.14~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f0c9761352efc06b498ad43f314b136d92cf05d;p=thirdparty%2Fhaproxy.git

[BUG] fix error checking in strl2ic/strl2uic()

The strl2ic() and strl2uic() primitives used to convert string to
integers could return 10 times the value read if they stopped on
non-digit because of a mis-placed loop exit.
---

diff --git a/include/common/standard.h b/include/common/standard.h
index 8efda8a4b4..a502951ea9 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -152,14 +152,14 @@ static inline unsigned int __strl2ui(const char *s, int len)
 static inline unsigned int __strl2uic(const char *s, int len)
 {
 	unsigned int i = 0;
-	unsigned int j;
+	unsigned int j, k;
 
 	while (len-- > 0) {
 		j = (*s++) - '0';
-		i = i * 10;
+		k = i * 10;
 		if (j > 9)
 			break;
-		i += j;
+		i = k + j;
 	}
 	return i;
 }
diff --git a/src/standard.c b/src/standard.c
index 69c8f4f5dc..80e0d1b4a3 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -248,27 +248,27 @@ unsigned int strl2uic(const char *s, int len)
 int strl2ic(const char *s, int len)
 {
 	int i = 0;
-	int j;
+	int j, k;
 
 	if (len > 0) {
 		if (*s != '-') {
 			/* positive number */
 			while (len-- > 0) {
 				j = (*s++) - '0';
-				i = i * 10;
+				k = i * 10;
 				if (j > 9)
 					break;
-				i += j;
+				i = k + j;
 			}
 		} else {
 			/* negative number */
 			s++;
 			while (--len > 0) {
 				j = (*s++) - '0';
-				i = i * 10;
+				k = i * 10;
 				if (j > 9)
 					break;
-				i -= j;
+				i = k - j;
 			}
 		}
 	}