From ab1adabf145d44c2955cfaa5cf9378360c15aede Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Wed, 6 Jan 2016 14:23:48 +0100 Subject: [PATCH] Revert "Follow-up fix for #12152 from axeld suggestions" This reverts commit 6f5971cf52bcab0f9cfcc203bdc8b62e3c9d8fec. * Sorry there was a misunderstanding in the Ticket and IRC. --- src/add-ons/kernel/network/stack/interfaces.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/network/stack/interfaces.cpp b/src/add-ons/kernel/network/stack/interfaces.cpp index f7f6a4dcf7..fb13c5cfca 100644 --- a/src/add-ons/kernel/network/stack/interfaces.cpp +++ b/src/add-ons/kernel/network/stack/interfaces.cpp @@ -409,8 +409,16 @@ InterfaceAddress::Prepare(sockaddr** _address, size_t size) sockaddr* address = *_address; - if (address == NULL || size > address->sa_len) - address = (sockaddr*)realloc(address, size); + if (address == NULL || size > address->sa_len) { + sockaddr* resized = (sockaddr*)realloc(address, size); + + if (resized == NULL) { + free(address); + return NULL; + } + + address = resized; + } address->sa_len = size;