From 78cc6f918f8110db652b5d540a471a9162294477 Mon Sep 17 00:00:00 2001
From: Ryan Leavengood <leavengood@gmail.com>
Date: Fri, 12 Sep 2008 05:20:49 +0000
Subject: [PATCH] Fixed CID 1298: In the case that sSelectedIcon is not valid,
 checkMark could be leaked. So I reorganized the if statement to remove this
 possibility.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27431 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/preferences/print/PrinterListView.cpp | 31 ++++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/preferences/print/PrinterListView.cpp b/src/preferences/print/PrinterListView.cpp
index 7dc87d997d..38404bae70 100644
--- a/src/preferences/print/PrinterListView.cpp
+++ b/src/preferences/print/PrinterListView.cpp
@@ -252,21 +252,22 @@ PrinterItem::PrinterItem(PrintersWindow* window, const BDirectory& node)
 
 	if (sIcon && sIcon->IsValid() && sSelectedIcon == NULL) {
 		BBitmap *checkMark = LoadBitmap("check_mark_icon", 'BBMP');
-		sSelectedIcon = new BBitmap(rect, B_RGBA32, true);
-		if (checkMark && checkMark->IsValid()
-			&& sSelectedIcon && sSelectedIcon->IsValid()) {
-			// draw check mark at bottom left over printer icon
-			BView *view = new BView(rect, "offscreen", B_FOLLOW_ALL, B_WILL_DRAW);
-			float y = rect.Height() - checkMark->Bounds().Height();
-			sSelectedIcon->Lock();
-			sSelectedIcon->AddChild(view);
-			view->DrawBitmap(sIcon);
-			view->SetDrawingMode(B_OP_ALPHA);
-			view->DrawBitmap(checkMark, BPoint(0, y));
-			view->Sync();
-			view->RemoveSelf();
-			sSelectedIcon->Unlock();
-			delete view;
+		if (checkMark && checkMark->IsValid()) {
+			sSelectedIcon = new BBitmap(rect, B_RGBA32, true);
+			if (sSelectedIcon && sSelectedIcon->IsValid()) {
+				// draw check mark at bottom left over printer icon
+				BView *view = new BView(rect, "offscreen", B_FOLLOW_ALL, B_WILL_DRAW);
+				float y = rect.Height() - checkMark->Bounds().Height();
+				sSelectedIcon->Lock();
+				sSelectedIcon->AddChild(view);
+				view->DrawBitmap(sIcon);
+				view->SetDrawingMode(B_OP_ALPHA);
+				view->DrawBitmap(checkMark, BPoint(0, y));
+				view->Sync();
+				view->RemoveSelf();
+				sSelectedIcon->Unlock();
+				delete view;
+			}
 			delete checkMark;
 		}
 	}