diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-22 17:23:49 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-22 17:39:12 +0100 |
commit | b2645747b7b4698ef93beb81a00ba5daaa0b1406 (patch) | |
tree | d0988c2789cd127bd2dff32fb0bbf16d6bb5bab4 /src/nspawn/nspawn-settings.c | |
parent | 54ed9f88dcb8d3fce981e44df29c700ec7ba9397 (diff) | |
download | systemd-b2645747b7b4698ef93beb81a00ba5daaa0b1406.tar.gz |
nspawn-oci: fix double free
Also rename function to make it clear that it also frees the array
object itself.
Diffstat (limited to 'src/nspawn/nspawn-settings.c')
-rw-r--r-- | src/nspawn/nspawn-settings.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index ab69f24c54..476cb0779e 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -110,7 +110,7 @@ static void free_oci_hooks(OciHook *h, size_t n) { free(h); } -void device_node_free_many(DeviceNode *node, size_t n) { +void device_node_array_free(DeviceNode *node, size_t n) { size_t i; for (i = 0; i < n; i++) @@ -156,8 +156,7 @@ Settings* settings_free(Settings *s) { sd_bus_message_unref(s->properties); free(s->supplementary_gids); - device_node_free_many(s->extra_nodes, s->n_extra_nodes); - free(s->extra_nodes); + device_node_array_free(s->extra_nodes, s->n_extra_nodes); free(s->network_namespace_path); strv_free(s->sysctl); |