i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use BReferenceable properties of LinearSpec in BALMLayout.

Browse Source 
This saves us from a potential use-afte-free bug.
This commit is contained in:
Alex Wilson
2012-05-03 08:44:54 +12:00
parent 7c3800078e
commit f9cabdd009
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/libs/alm/ALMLayout.h
-1
View File
@@ -170,7 +170,6 @@ private:
bool _TrySolve(); bool _TrySolve();
LinearProgramming::LinearSpec* fSolver; LinearProgramming::LinearSpec* fSolver;
LinearProgramming::LinearSpec fOwnSolver;
BReference<XTab> fLeft; BReference<XTab> fLeft;
BReference<XTab> fRight; BReference<XTab> fRight;
src/libs/alm/ALMLayout.cpp
+3 -2
View File
@@ -13,7 +13,6 @@
#include <ControlLook.h> #include <ControlLook.h>
#include "ALMGroup.h"
#include "RowColumnManager.h" #include "RowColumnManager.h"
#include "ViewLayoutItem.h" #include "ViewLayoutItem.h"
@@ -61,7 +60,8 @@ BALMLayout::BALMLayout(float hSpacing, float vSpacing, BALMLayout* friendLayout)
fVSpacing(BControlLook::ComposeSpacing(vSpacing)), fVSpacing(BControlLook::ComposeSpacing(vSpacing)),
fBadLayoutPolicy(new DefaultPolicy()) fBadLayoutPolicy(new DefaultPolicy())
{ {
fSolver = friendLayout ? friendLayout->Solver() : &fOwnSolver; fSolver = friendLayout ? friendLayout->Solver() : new LinearSpec();
fSolver->AcquireReference();
fRowColumnManager = new RowColumnManager(fSolver); fRowColumnManager = new RowColumnManager(fSolver);
fLeft = AddXTab(); fLeft = AddXTab();
@@ -86,6 +86,7 @@ BALMLayout::~BALMLayout()
{ {
delete fRowColumnManager; delete fRowColumnManager;
delete fBadLayoutPolicy; delete fBadLayoutPolicy;
fSolver->ReleaseReference();
} }