From 8d3d389fc76d4bf4bf7a27c7ee1bdefc2399137b Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 11 Feb 2010 12:52:22 +0000
Subject: CID-73

Checker: FORWARD_NULL
Function: LLToolPie::pickRightMouseDownCallback()
File: /indra/newview/lltoolpie.cpp
---
 indra/newview/lltoolpie.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index bf1e307d71..fdf9e1df2e 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1485,6 +1485,12 @@ BOOL LLToolPie::pickRightMouseDownCallback()
 			while( object && object->isAttachment())
 			{
 				object = (LLViewerObject*)object->getParent();
+				llassert(object);
+			}
+
+			if (!object)
+			{
+				return TRUE; // unexpected, but escape
 			}
 
 			// Object is an avatar, so check for mute by id.
-- 
cgit v1.2.3