[PATCH v2 1/3] lib: parse_area_spec: don't modify *start value if parse failed

[Peter Mamonov]

Signed-off-by: Peter Mamonov <pmamo...@gmail.com>
---
 lib/misc.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/misc.c b/lib/misc.c
index 62ddd6677..1767043d1 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -79,19 +79,19 @@ EXPORT_SYMBOL(strtoul_suffix);
 int parse_area_spec(const char *str, loff_t *start, loff_t *size)
 {
        char *endp;
-       loff_t end;
+       loff_t end, _start;
 
        if (!isdigit(*str))
                return -1;
 
-       *start = strtoull_suffix(str, &endp, 0);
+       _start = strtoull_suffix(str, &endp, 0);
 
        str = endp;
 
        if (!*str) {
                /* beginning given, but no size, assume maximum size */
                *size = ~0;
-               return 0;
+               goto success;
        }
 
        if (*str == '-') {
@@ -102,15 +102,19 @@ int parse_area_spec(const char *str, loff_t *start, 
loff_t *size)
                        return -1;
                }
                *size = end - *start + 1;
-               return 0;
+               goto success;
        }
 
        if (*str == '+') {
                /* beginning and size given */
                *size = strtoull_suffix(str + 1, NULL, 0);
-               return 0;
+               goto success;
        }
 
        return -1;
+
+success:
+       *start = _start;
+       return 0;
 }
 EXPORT_SYMBOL(parse_area_spec);
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox