diff options
| author | Swen Schillig <swen@linux.ibm.com> | 2019-01-29 14:36:44 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-03-01 00:32:11 +0000 |
| commit | ebeae5dcbad898e8ee0d64c4ed44751b753f27de (patch) | |
| tree | 568cb97409333def83f263865758847df0f3e51b /nsswitch | |
| parent | ea7231dcc0b50c535f913f0542d600d0b2119a21 (diff) | |
| download | samba-ebeae5dcbad898e8ee0d64c4ed44751b753f27de.tar.gz | |
wbinfo: Use wrapper for string to integer conversion
In order to detect an value overflow error during
the string to integer conversion with strtoul/strtoull,
the errno variable must be set to zero before the execution and
checked after the conversion is performed. This is achieved by
using the wrapper function strtoul_err and strtoull_err.
Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Ralph Böhme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'nsswitch')
| -rw-r--r-- | nsswitch/wbinfo.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index 6a1dbd9b56b..b8f04536299 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -141,6 +141,7 @@ static bool parse_wbinfo_domain_user(const char *domuser, fstring domain, static bool parse_mapping_arg(char *arg, int *id, char **sid) { char *tmp, *endptr; + int error = 0; if (!arg || !*arg) return false; @@ -153,9 +154,9 @@ static bool parse_mapping_arg(char *arg, int *id, char **sid) /* Because atoi() can return 0 on invalid input, which would be a valid * UID/GID we must use strtoul() and do error checking */ - *id = strtoul(tmp, &endptr, 10); + *id = strtoul_err(tmp, &endptr, 10, &error); - if (endptr[0] != '\0') + if (endptr[0] != '\0' || error != 0) return false; return true; @@ -1417,7 +1418,14 @@ static bool wbinfo_lookuprids(const char *domain, const char *arg) p = arg; while (next_token_talloc(mem_ctx, &p, &ridstr, " ,\n")) { - uint32_t rid = strtoul(ridstr, NULL, 10); + int error = 0; + uint32_t rid; + + rid = strtoul_err(ridstr, NULL, 10, &error); + if (error != 0) { + d_printf("failed to convert rid\n"); + goto done; + } rids = talloc_realloc(mem_ctx, rids, uint32_t, num_rids + 1); if (rids == NULL) { d_printf("talloc_realloc failed\n"); |