hrev49320 adds 3 changesets to branch 'master'
old head: 4a35186ac299ef743c74ad2cb9c2b230fcf556b6
new head: 50e2057db04e8ed0d98982462fe0fb56195cdc6a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=50e2057db04e+%5E4a35186ac299
----------------------------------------------------------------------------
2201ddd6d0cb: NetFSServer: Forward errors and fix use-after-free.
At least right now, the constructor of ServerInfoSender can only fail
because of OOM.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Fixes #11716. One minor tweak by me from the original patch
(change "!sender" to "sender == NULL").
[ Timothy Gu <timothygu99@xxxxxxxxx> ]
d91933c26fdb: HIDWriter: 0-initialize struct
Fixes CID 610984.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
[ Timothy Gu <timothygu99@xxxxxxxxx> ]
50e2057db04e: BGridLayout: fix reversal of parameters.
CID 1210907.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
[ Puck Meerburg <puck@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 10 insertions(+), 4 deletions(-)
src/add-ons/kernel/drivers/input/usb_hid/HIDWriter.cpp | 2 +-
.../kernel/file_systems/netfs/server/NetFSServer.cpp | 10 ++++++++--
src/kits/interface/GridLayout.cpp | 2 +-
############################################################################
Commit: 2201ddd6d0cb5a1f8ca290027fda896f81e3a24b
URL: http://cgit.haiku-os.org/haiku/commit/?id=2201ddd6d0cb
Author: Timothy Gu <timothygu99@xxxxxxxxx>
Date: Wed Jan 7 00:11:58 2015 UTC
Committer: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Commit-Date: Tue Jun 23 15:58:23 2015 UTC
Ticket: https://dev.haiku-os.org/ticket/11716
NetFSServer: Forward errors and fix use-after-free.
At least right now, the constructor of ServerInfoSender can only fail
because of OOM.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Fixes #11716. One minor tweak by me from the original patch
(change "!sender" to "sender == NULL").
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
b/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
index 49041d1..4bcf77d 100644
--- a/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
@@ -800,7 +800,7 @@ NetFSServer::_LoadSecurityContext(SecurityContext**
_securityContext)
// load the fallback settings, if present
BPath path;
DriverSettings settings;
-
+
if (_GetSettingsDirPath(&path, false) == B_OK
&& path.Append(kFallbackSettingsFileName) == B_OK
&& settings.Load(path.Path()) == B_OK) {
@@ -1283,9 +1283,15 @@ NetFSServer::_ServerInfoConnectionListener()
// create a server info sender thread
ServerInfoSender* sender = new(std::nothrow)
ServerInfoSender(fd, info);
- if (!sender || sender->Init() != B_OK) {
+ if (sender == NULL) {
+ closesocket(fd);
+ delete sender;
+ return B_NO_MEMORY;
+ }
+ if ((error = sender->Init()) != B_OK) {
closesocket(fd);
delete sender;
+ return error;
}
taskManager.RunTask(sender);
}
############################################################################
Commit: d91933c26fdb8f21bd7fbc9f7c4685915a0e6602
URL: http://cgit.haiku-os.org/haiku/commit/?id=d91933c26fdb
Author: Timothy Gu <timothygu99@xxxxxxxxx>
Date: Wed Jan 7 00:33:36 2015 UTC
Committer: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Commit-Date: Tue Jun 23 15:59:36 2015 UTC
HIDWriter: 0-initialize struct
Fixes CID 610984.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/input/usb_hid/HIDWriter.cpp
b/src/add-ons/kernel/drivers/input/usb_hid/HIDWriter.cpp
index dc32ab2..f229085 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/HIDWriter.cpp
+++ b/src/add-ons/kernel/drivers/input/usb_hid/HIDWriter.cpp
@@ -42,7 +42,7 @@ HIDWriter::DefineInputPadding(uint8 count, uint8 bitLength)
SetReportSize(bitLength);
SetReportCount(count);
- main_item_data data;
+ main_item_data data = { 0 };
data.data_constant = 1;
return Input(data);
}
############################################################################
Revision: hrev49320
Commit: 50e2057db04e8ed0d98982462fe0fb56195cdc6a
URL: http://cgit.haiku-os.org/haiku/commit/?id=50e2057db04e
Author: Puck Meerburg <puck@xxxxxxxxxxxxx>
Date: Sat Dec 27 17:06:45 2014 UTC
Committer: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Commit-Date: Tue Jun 23 16:01:35 2015 UTC
BGridLayout: fix reversal of parameters.
CID 1210907.
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/kits/interface/GridLayout.cpp
b/src/kits/interface/GridLayout.cpp
index a5be840..135d7d8 100644
--- a/src/kits/interface/GridLayout.cpp
+++ b/src/kits/interface/GridLayout.cpp
@@ -425,7 +425,7 @@ BGridLayout::AddItem(BLayoutItem* item)
// find a free spot
for (int32 row = 0; row < fRowCount; row++) {
for (int32 column = 0; column < fColumnCount; column++) {
- if (_IsGridCellEmpty(row, column))
+ if (_IsGridCellEmpty(column, row))
return AddItem(item, column, row, 1, 1);
}
}
