From 2888e446a723d6c477fa07fcc733dcc16e021fef Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 5 Jul 2010 12:00:02 +0100
Subject: CID-496

Checker: FORWARD_NULL
Function: LLFloaterVoiceEffect::refreshEffectList()
File: /indra/newview/llfloatervoiceeffect.cpp
---
 indra/newview/llfloatervoiceeffect.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index ca1f142760..3ab061dbea 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -199,7 +199,12 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			if(sl_item)
 			{
 				LLFontGL::StyleFlags style = is_template_only ? LLFontGL::NORMAL : LLFontGL::BOLD;
-				dynamic_cast<LLScrollListText*>(sl_item->getColumn(0))->setFontStyle(style);
+				LLScrollListText slt = dynamic_cast<LLScrollListText*>(sl_item->getColumn(0));
+				llassert(slt);
+				if (slt)
+				{
+					slt->setFontStyle(style);
+				}
 			}
 		}
 	}
-- 
cgit v1.2.3


From 1ff353452174c37c600d7de650348ab30f91b86c Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 5 Jul 2010 12:17:54 +0100
Subject: CID-499

Checker: FORWARD_NULL
Function: LLAppearanceMgr::dumpItemArray(const LLDynamicArray<LLPointer<LLViewerInventoryItem>, (int)32> &, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/newview/llappearancemgr.cpp
---
 indra/newview/llfloatervoiceeffect.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 3ab061dbea..61fe50e301 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -199,7 +199,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			if(sl_item)
 			{
 				LLFontGL::StyleFlags style = is_template_only ? LLFontGL::NORMAL : LLFontGL::BOLD;
-				LLScrollListText slt = dynamic_cast<LLScrollListText*>(sl_item->getColumn(0));
+				LLScrollListText* slt = dynamic_cast<LLScrollListText*>(sl_item->getColumn(0));
 				llassert(slt);
 				if (slt)
 				{
-- 
cgit v1.2.3