From 1394d21b7a525c4cbe6780dbd478d3bf2f946fa3 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 2 Mar 2010 09:53:52 +0000
Subject: [PATCH] CID-436
Checker: NULL_RETURNS
Function: RecoveredItemCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
---
indra/newview/llappearancemgr.cpp | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 03782510f2f..5c21be8c326 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -575,12 +575,16 @@ class RecoveredItemCB: public LLInventoryCallback
mWearable->setItemID(item_id);
LLPointer<LLInventoryCallback> cb = new RecoveredItemLinkCB(mType,mWearable,mHolder);
mHolder->mTypesToRecover.erase(mType);
- link_inventory_item( gAgent.getID(),
- item_id,
- LLAppearanceManager::instance().getCOF(),
- itemp->getName(),
- LLAssetType::AT_LINK,
- cb);
+ llassert(itemp);
+ if (itemp)
+ {
+ link_inventory_item( gAgent.getID(),
+ item_id,
+ LLAppearanceManager::instance().getCOF(),
+ itemp->getName(),
+ LLAssetType::AT_LINK,
+ cb);
+ }
}
private:
LLWearableHoldingPattern* mHolder;
--
GitLab