diff options
| author | Peter Mamonov <pmamonov@gmail.com> | 2018-01-15 14:32:31 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-17 09:10:01 +0100 |
| commit | fd569c747ead69a5a6930d4cd6493e6d899a79df (patch) | |
| tree | 25ac7d9d7dab056ec54d59d8ff17df1280936925 /lib | |
| parent | 78936cb9411f7c7ecbebdc8d46d8dbfe981bbba6 (diff) | |
| download | barebox-fd569c747ead69a5a6930d4cd6493e6d899a79df.tar.gz barebox-fd569c747ead69a5a6930d4cd6493e6d899a79df.tar.xz | |
lib: parse_area_spec: don't modify *start value if parse failed
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/misc.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/misc.c b/lib/misc.c index 62ddd66779..7a1ac257f3 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -79,38 +79,42 @@ 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 == '-') { /* beginning and end given */ end = strtoull_suffix(str + 1, NULL, 0); - if (end < *start) { + if (end < _start) { printf("end < start\n"); return -1; } - *size = end - *start + 1; - return 0; + *size = end - _start + 1; + 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); |