Fix return value in trailing_strtoln()

This function should return -1 if there is no trailing integer in the string. Instead it returns 0. Fix it by checking for this condition at the start. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Fix return value in trailing_strtoln()
This function should return -1 if there is no trailing integer in the string. Instead it returns 0. Fix it by checking for this condition at the start. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Simon Glass · Bin Meng
1 parent a5b8722532
Showing 1 changed file with 5 additions and 3 deletions Side-by-side Diff
lib/strto.c
@@ -160,9 +160,11 @@
  
 	if (!end)
 		end = str + strlen(str);
-	for (p = end - 1; p > str; p--) {
-		if (!isdigit(*p))
-			return simple_strtoul(p + 1, NULL, 10);
+	if (isdigit(end[-1])) {
+		for (p = end - 1; p > str; p--) {
+			if (!isdigit(*p))
+				return simple_strtoul(p + 1, NULL, 10);
+		}
 	}
  
 	return -1;
...	...	@@ -160,9 +160,11 @@
160	160
161	161	if (!end)
162	162	end = str + strlen(str);
163		- for (p = end - 1; p > str; p--) {
164		- if (!isdigit(*p))
165		- return simple_strtoul(p + 1, NULL, 10);
	163	+ if (isdigit(end[-1])) {
	164	+ for (p = end - 1; p > str; p--) {
	165	+ if (!isdigit(*p))
	166	+ return simple_strtoul(p + 1, NULL, 10);
	167	+ }
166	168	}
167	169
168	170	return -1;