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>

diff --git a/src/utils.c b/src/utils.c
index 848eba94bfdbf4e424f9133491964892edd0f1e7..9a0bcfec1fc1d615ed3970104da09abfd4788eb7 100644 (file)
--- 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)