hrev49306 adds 2 changesets to branch 'master'
old head: 29355b23a73da4ccf6625aeea92c028fba77ae9f
new head: fa57a184e4c2792c4ad2b01603c66c1c265e1638
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=fa57a184e4c2+%5E29355b23a73d
----------------------------------------------------------------------------
2d6b0e967b86: Revert "Missing NULL check in network stack."
This reverts commit dd0ea64b5607e6310c582f62c4275dab7510c4f6.
fa57a184e4c2: APR: update to 1.5.2.
Fixes #12166.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 6 deletions(-)
build/jam/repositories/HaikuPorts/x86_gcc2 | 4 ++--
src/add-ons/kernel/network/stack/interfaces.cpp | 4 ----
############################################################################
Commit: 2d6b0e967b8641a9ebbb73035f430dca6954c28b
URL: http://cgit.haiku-os.org/haiku/commit/?id=2d6b0e967b86
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Tue Jun 16 16:09:04 2015 UTC
Revert "Missing NULL check in network stack."
This reverts commit dd0ea64b5607e6310c582f62c4275dab7510c4f6.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/network/stack/interfaces.cpp
b/src/add-ons/kernel/network/stack/interfaces.cpp
index 110afeb..20b4110 100644
--- a/src/add-ons/kernel/network/stack/interfaces.cpp
+++ b/src/add-ons/kernel/network/stack/interfaces.cpp
@@ -1370,8 +1370,6 @@ update_interface_address(InterfaceAddress*
interfaceAddress, int32 option,
sockaddr* defaultNetmask = NULL;
const sockaddr* netmask = NULL;
if (option == SIOCSIFADDR) {
- if (address == NULL)
- return B_BAD_VALUE;
defaultNetmask = InterfaceAddress::Prepare(
&interfaceAddress->mask,
address->sa_len);
} else
@@ -1382,8 +1380,6 @@ update_interface_address(InterfaceAddress*
interfaceAddress, int32 option,
sockaddr* defaultBroadcast = NULL;
if ((domain->address_module->flags
&
NET_ADDRESS_MODULE_FLAG_BROADCAST_ADDRESS) != 0) {
- if (address == NULL)
- return B_BAD_VALUE;
defaultBroadcast = InterfaceAddress::Prepare(
&interfaceAddress->destination,
address->sa_len);
} else
############################################################################
Revision: hrev49306
Commit: fa57a184e4c2792c4ad2b01603c66c1c265e1638
URL: http://cgit.haiku-os.org/haiku/commit/?id=fa57a184e4c2
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Wed Jun 17 19:26:27 2015 UTC
Ticket: https://dev.haiku-os.org/ticket/12166
APR: update to 1.5.2.
Fixes #12166.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index ba964e8..2c287bc 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -33,8 +33,8 @@ RemotePackageRepository HaikuPorts
album-0.9.3-1
ale-0.9.1-2
app2png-1.0.0-1
- apr-1.5.0-1
- apr_devel-1.5.0-1
+ apr-1.5.2-1
+ apr_devel-1.5.2-1
apr_util-1.5.3-1
apr_util_devel-1.5.3-1
armyknife-4.3.0-3
