diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-12-02 23:12:34 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-12-03 18:34:41 +0100 |
| commit | d95a703746d5394d56a9f464e343594e4882da0d (patch) | |
| tree | 5fbbe641c1d7b2e00edbcbd43b2ed2cdb80814bb /src | |
| parent | 835d645f4052551c5c1829c37a07c882f2260f65 (diff) | |
chain: Correctly check realloc() call
If realloc() fails, it returns NULL but the original pointer is
untouchted and therefore still has to be freed. Unconditionally
overwriting the old pointer is therefore a bad idea, use a temporary
variable instead.
Fixes: e3ac19b5ec162 ("chain: multi-device support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/chain.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/chain.c b/src/chain.c index 9cc8735..b9a16fc 100644 --- a/src/chain.c +++ b/src/chain.c @@ -605,7 +605,7 @@ static int nftnl_chain_parse_hook_cb(const struct nlattr *attr, void *data) static int nftnl_chain_parse_devs(struct nlattr *nest, struct nftnl_chain *c) { - const char **dev_array; + const char **dev_array, **tmp; int len = 0, size = 8; struct nlattr *attr; @@ -618,14 +618,13 @@ static int nftnl_chain_parse_devs(struct nlattr *nest, struct nftnl_chain *c) goto err; dev_array[len++] = strdup(mnl_attr_get_str(attr)); if (len >= size) { - dev_array = realloc(dev_array, - size * 2 * sizeof(char *)); - if (!dev_array) + tmp = realloc(dev_array, size * 2 * sizeof(char *)); + if (!tmp) goto err; size *= 2; - memset(&dev_array[len], 0, - (size - len) * sizeof(char *)); + memset(&tmp[len], 0, (size - len) * sizeof(char *)); + dev_array = tmp; } } |