[haiku-commits] haiku: hrev47480 - src/servers/input
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 11 Jul 2014 19:04:41 +0200 (CEST)
hrev47480 adds 2 changesets to branch 'master'
old head: 7481292e36e2da13e6221c010613d7f2f8edd8d6
new head: 8674959175ead46ef143a0a60c59e34ce77294c0
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=8674959+%5E7481292
----------------------------------------------------------------------------
b128ce7: Input Server: style fix, compare with 0 explicitly
8674959: Input Server: Fix double free.
CID610594
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
src/servers/input/AddOnManager.cpp | 4 ++--
############################################################################
Commit: b128ce7eff2ec5f094d555690894448d60d7cf4f
URL: http://cgit.haiku-os.org/haiku/commit/?id=b128ce7
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jul 11 17:02:51 2014 UTC
Input Server: style fix, compare with 0 explicitly
----------------------------------------------------------------------------
diff --git a/src/servers/input/AddOnManager.cpp
b/src/servers/input/AddOnManager.cpp
index eeb3248..51bdc83 100644
--- a/src/servers/input/AddOnManager.cpp
+++ b/src/servers/input/AddOnManager.cpp
@@ -471,7 +471,7 @@ AddOnManager::_RegisterFilter(BInputServerFilter* filter,
const entry_ref& ref,
for (int32 i = fFilterList.CountItems(); i-- > 0;) {
filter_info* info = fFilterList.ItemAt(i);
- if (!strcmp(info->ref.name, ref.name)) {
+ if (strcmp(info->ref.name, ref.name) == 0) {
// we already know this ref
delete filter;
return B_NAME_IN_USE;
############################################################################
Revision: hrev47480
Commit: 8674959175ead46ef143a0a60c59e34ce77294c0
URL: http://cgit.haiku-os.org/haiku/commit/?id=8674959
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jul 11 17:04:26 2014 UTC
Input Server: Fix double free.
CID610594
----------------------------------------------------------------------------
diff --git a/src/servers/input/AddOnManager.cpp
b/src/servers/input/AddOnManager.cpp
index 51bdc83..757ccbf 100644
--- a/src/servers/input/AddOnManager.cpp
+++ b/src/servers/input/AddOnManager.cpp
@@ -496,7 +496,7 @@ AddOnManager::_RegisterFilter(BInputServerFilter* filter,
const entry_ref& ref,
BAutolock locker(InputServer::gInputFilterListLocker);
if (!InputServer::gInputFilterList.AddItem(filter)) {
- fFilterList.RemoveItem(info);
+ fFilterList.RemoveItem(info, false);
delete info;
return B_NO_MEMORY;
}
Other related posts:
- » [haiku-commits] haiku: hrev47480 - src/servers/input - jscipione
