diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-11 00:40:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-11 00:40:22 -0700 |
| commit | e5a68ffaa375a3503ac31de90a8a2c09d5526740 (patch) | |
| tree | 338be0f46e39dddfdbe0c5d81a40e4d1815d600e /lib | |
| parent | 0f0e37eeace714d4b3bb6907323d46ba2c6d73f1 (diff) | |
| parent | 9aabfa05967291ecbc7a0bfcca27c9669dd1853e (diff) | |
Merge "Merge android-4.4@8c91412 (v4.4.75) into msm-4.4"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cmdline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/cmdline.c b/lib/cmdline.c index 8f13cf73c2ec..79069d7938ea 100644 --- a/lib/cmdline.c +++ b/lib/cmdline.c @@ -22,14 +22,14 @@ * the values[M, M+1, ..., N] into the ints array in get_options. */ -static int get_range(char **str, int *pint) +static int get_range(char **str, int *pint, int n) { int x, inc_counter, upper_range; (*str)++; upper_range = simple_strtol((*str), NULL, 0); inc_counter = upper_range - *pint; - for (x = *pint; x < upper_range; x++) + for (x = *pint; n && x < upper_range; x++, n--) *pint++ = x; return inc_counter; } @@ -96,7 +96,7 @@ char *get_options(const char *str, int nints, int *ints) break; if (res == 3) { int range_nums; - range_nums = get_range((char **)&str, ints + i); + range_nums = get_range((char **)&str, ints + i, nints - i); if (range_nums < 0) break; /* |