From: Godbach <nylzhaowei@gmail.com>
Date: Wed, 28 Jan 2015 09:36:16 +0000 (+0800)
Subject: BUG/MINOR: parse: check the validity of size string in a more strict way
X-Git-Tag: v1.6-dev1~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58048a2dc98bfa7f59d86fe2ca878d95ca2310e3;p=thirdparty%2Fhaproxy.git

BUG/MINOR: parse: check the validity of size string in a more strict way

If a stick table is defined as below:
	stick-table type ip size 50ka expire 300s

HAProxy will stop parsing size after passing through "50k" and return the value
directly. But such format string of size should not be valid. The patch checks
the next character to report error if any.

Signed-off-by: Godbach <nylzhaowei@gmail.com>
---

diff --git a/src/standard.c b/src/standard.c
index 93c44bb3ce..f28825f827 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -1656,6 +1656,9 @@ const char *parse_size_err(const char *text, unsigned *ret) {
 		return text;
 	}
 
+	if (*text != '\0' && *++text != '\0')
+		return text;
+
 	*ret = value;
 	return NULL;
 }