diff options
| author | Arturo Borrero <arturo.borrero.glez@gmail.com> | 2013-08-19 14:37:30 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-20 13:08:51 +0200 |
| commit | 978988a0f4730f1da2cfd7e3fa0670711bb6b802 (patch) | |
| tree | fc7814d2cc76cb2dd221bae7d8908539f8b46656 | |
| parent | 2df345744af311bdf9b7e0a127fa34a6fb1aac3a (diff) | |
utils: fix error path for nft_strtoi
If the return of nft_get_value() is not evaluated, we don't know if
the parsed value is between the limits of its type.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/utils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/utils.c b/src/utils.c index 848eba9..9a0bcfe 100644 --- a/src/utils.c +++ b/src/utils.c @@ -103,6 +103,7 @@ int nft_get_value(enum nft_type type, void *val, void *out) int nft_strtoi(const char *string, int base, void *out, enum nft_type type) { + int ret; int64_t sval = 0; uint64_t uval = -1; char *endptr; @@ -113,14 +114,14 @@ int nft_strtoi(const char *string, int base, void *out, enum nft_type type) case NFT_TYPE_U32: case NFT_TYPE_U64: uval = strtoll(string, &endptr, base); - nft_get_value(type, &uval, out); + ret = nft_get_value(type, &uval, out); break; case NFT_TYPE_S8: case NFT_TYPE_S16: case NFT_TYPE_S32: case NFT_TYPE_S64: sval = strtoull(string, &endptr, base); - nft_get_value(type, &sval, out); + ret = nft_get_value(type, &sval, out); break; default: errno = EINVAL; @@ -132,7 +133,7 @@ int nft_strtoi(const char *string, int base, void *out, enum nft_type type) return -1; } - return 0; + return ret; } const char *nft_verdict2str(uint32_t verdict) |