summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2015-10-16 14:51:20 +0200
committerDavid Sterba <dsterba@suse.com>2015-11-02 09:35:03 +0100
commit2b7f0192e84a913119fb3f5652e287909da735c9 (patch)
treefd198d119aa399be3f622e2f2c6e4dc382a6d826
parent9288d0bc230e12a5d49adefc6f7976483688a69a (diff)
btrfs-progs: do not modify the string in parse_range
It's passed as const but we modify it through 'dots'. This would break parsing the string multiple times. Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--cmds-balance.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/cmds-balance.c b/cmds-balance.c
index c1219bec..d7f81482 100644
--- a/cmds-balance.c
+++ b/cmds-balance.c
@@ -101,6 +101,7 @@ static int parse_u64(const char *str, u64 *result)
static int parse_range(const char *range, u64 *start, u64 *end)
{
char *dots;
+ char *endptr;
const char *rest;
int skipped = 0;
@@ -109,20 +110,21 @@ static int parse_range(const char *range, u64 *start, u64 *end)
return 1;
rest = dots + 2;
- *dots = 0;
if (!*rest) {
*end = (u64)-1;
skipped++;
} else {
- if (parse_u64(rest, end))
+ *end = strtoull(rest, &endptr, 10);
+ if (*endptr)
return 1;
}
if (dots == range) {
*start = 0;
skipped++;
} else {
- if (parse_u64(range, start))
+ *end = strtoull(range, &endptr, 10);
+ if (*endptr != 0 && *endptr != '.')
return 1;
}