hrev50814 adds 2 changesets to branch 'master'
old head: 80d8697c0ec83093b2552c90a9c947189245f51f
new head: 57db30a7523ca039c83b11c6b3f7df005c34c3c0
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=57db30a7523c+%5E80d8697c0ec8
----------------------------------------------------------------------------
22e3e14aab00: TabDecorator.cpp: fix dereference of null pointer
Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
fixes #13137
57db30a7523c: find_paths.cpp: fix memory leak
Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
fixes #13136
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 3 insertions(+), 1 deletion(-)
src/servers/app/decorator/TabDecorator.cpp | 3 ++-
src/system/libroot/os/find_paths.cpp | 1 +
############################################################################
Commit: 22e3e14aab0091f651d31af22367ce5ac65f5ddb
URL: http://cgit.haiku-os.org/haiku/commit/?id=22e3e14aab00
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Fri Dec 30 03:02:38 2016 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jan 1 10:36:36 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/13137
TabDecorator.cpp: fix dereference of null pointer
Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
fixes #13137
----------------------------------------------------------------------------
diff --git a/src/servers/app/decorator/TabDecorator.cpp
b/src/servers/app/decorator/TabDecorator.cpp
index a5953f2..fe64fc9 100644
--- a/src/servers/app/decorator/TabDecorator.cpp
+++ b/src/servers/app/decorator/TabDecorator.cpp
@@ -465,7 +465,8 @@ TabDecorator::_DistributeTabSize(float delta)
}
// done
- previousTab->tabRect.right = floorf(fFrame.right + fBorderWidth);
+ if (previousTab != NULL)
+ previousTab->tabRect.right = floorf(fFrame.right +
fBorderWidth);
for (int32 i = 0; i < tabCount; i++) {
Decorator::Tab* tab = fTabList.ItemAt(i);
############################################################################
Revision: hrev50814
Commit: 57db30a7523ca039c83b11c6b3f7df005c34c3c0
URL: http://cgit.haiku-os.org/haiku/commit/?id=57db30a7523c
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Fri Dec 30 03:03:21 2016 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Sun Jan 1 10:38:13 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/13136
find_paths.cpp: fix memory leak
Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
fixes #13136
----------------------------------------------------------------------------
diff --git a/src/system/libroot/os/find_paths.cpp
b/src/system/libroot/os/find_paths.cpp
index 076eaa0..2660cd1 100644
--- a/src/system/libroot/os/find_paths.cpp
+++ b/src/system/libroot/os/find_paths.cpp
@@ -125,6 +125,7 @@ public:
homeInstallationLocation);
if (locations != NULL && locations->IsValid())
return locations;
+ delete locations;
}
}
