summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-11-28 22:53:12 +0100
committerThomas Haller <thaller@redhat.com>2015-11-28 22:53:31 +0100
commit27835ba73c242e4d8232562c6b6eca4861b1097f (patch)
tree27a0cd27fb3897a87e0e445b2399c9ddbc2801aa
parent4eab8191ebfa1ff97bf3317d8c80e488ce179fd7 (diff)
downloadNetworkManager-27835ba73c242e4d8232562c6b6eca4861b1097f.tar.gz
Revert "systemd: fix potential memory leaks"
@random_data is declared as _cleanup_free_. Freeing it is unnecessary and freeing without clearing the pointer leads do a double free. This reverts commit 3d1557eaad4d408218bee8996c3721eb2aa5e22c.
-rw-r--r--src/systemd/src/libsystemd-network/sd-ipv4ll.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/systemd/src/libsystemd-network/sd-ipv4ll.c b/src/systemd/src/libsystemd-network/sd-ipv4ll.c
index fbf0dc5646..a3eaf2b4f5 100644
--- a/src/systemd/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/systemd/src/libsystemd-network/sd-ipv4ll.c
@@ -211,10 +211,8 @@ int sd_ipv4ll_set_address_seed(sd_ipv4ll *ll, unsigned seed) {
return -ENOMEM;
random_data_state = new0(char, 128);
- if (!random_data_state) {
- free(random_data);
+ if (!random_data_state)
return -ENOMEM;
- }
r = initstate_r(seed, random_data_state, 128, random_data);
if (r < 0)