Message ID | 1475721740-15124-4-git-send-email-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Bin Meng |
Headers | show |
On Thu, Oct 6, 2016 at 10:42 AM, Simon Glass <sjg@chromium.org> wrote: > 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> > --- > > Changes in v2: None > > lib/strto.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > applied to u-boot-x86, thanks!
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;