From bdef3a8ede844767827abb081b28bf8661c4af80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 24 Mar 2005 12:59:13 +0000 Subject: [PATCH] spotted some potetial segfault bugs git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11969 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/server/LayerData.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/servers/app/server/LayerData.cpp b/src/servers/app/server/LayerData.cpp index 3f517eb764..4bef79af3d 100644 --- a/src/servers/app/server/LayerData.cpp +++ b/src/servers/app/server/LayerData.cpp @@ -60,12 +60,12 @@ DrawData::DrawData(void) DrawData::~DrawData(void) { - if (clipReg) - delete clipReg; + delete clipReg; } DrawData::DrawData(const DrawData &data) { + clipReg = NULL; *this=data; } @@ -115,16 +115,15 @@ LayerData::LayerData(void) LayerData::LayerData(const LayerData &data) { + clipReg = NULL; *this=data; } LayerData::~LayerData(void) { - if (prevState) - { - delete prevState; - prevState=NULL; - } + delete prevState; + // NOTE: we're in the destructor here. why the assignment? + prevState=NULL; } LayerData &LayerData::operator=(const LayerData &from)