string buffer can have a newline character

Change-Id: I44647f8bd17a6b3c83d160cff03354c0a02b222d

diff --git a/shared/str-util.c b/shared/str-util.c
index 448f7b041a31366c69b49dba2cb6d9d3935c2a2b..e908ee0e5666816dcccd858ec832f008e4691943 100644 (file)
--- a/shared/str-util.c
+++ b/shared/str-util.c
@@ -52,7 +52,8 @@ convert_strtol(const char *str, char **endptr, int base, long *val)
 
        errno = 0;
        v = strtol(str, endptr, base);
-       if (errno != 0 || *endptr == str || **endptr != '\0')
+       if (errno != 0 || *endptr == str ||
+           (**endptr != '\0' && **endptr != '\n' && **endptr != '\r'))
                return false;
 
        errno = prev_errno;
@@ -87,7 +88,8 @@ convert_strtoul (const char *str, char **endptr, int base, unsigned long *val)
 
        errno = 0;
        v = strtoul(str, endptr, base);
-       if (errno != 0 || *endptr == str || **endptr != '\0')
+       if (errno != 0 || *endptr == str ||
+           (**endptr != '\0' && **endptr != '\n' && **endptr != '\r'))
               return false;
 
        errno = prev_errno;