[U-Boot] [PATCH 03/12] 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 ---

lib/strto.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/strto.c b/lib/strto.c index a6c0157..e93a4f5 100644 --- a/lib/strto.c +++ b/lib/strto.c @@ -160,9 +160,11 @@ long trailing_strtoln(const char *str, const char *end)

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;