From ac7539bd68b771a934cfdff79af2dfba336fca8d Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 2 Mar 2010 09:50:09 +0000 Subject: CID-437 Checker: REVERSE_INULL Function: RecoveredItemLinkCB::fire(const LLUUID &) File: /indra/newview/llappearancemgr.cpp --- indra/newview/llappearancemgr.cpp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'indra/newview/llappearancemgr.cpp') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 71df064236..03782510f2 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -528,22 +528,29 @@ public: LLViewerInventoryItem *item = gInventory.getItem(item_id); LLViewerInventoryItem *linked_item = item ? item->getLinkedItem() : NULL; - gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID()); - - if (item && linked_item) + if (linked_item) { - LLFoundData found(linked_item->getUUID(), - linked_item->getAssetUUID(), - linked_item->getName(), - linked_item->getType(), - linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID - ); - found.mWearable = mWearable; - mHolder->mFoundList.push_front(found); + gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID()); + + if (item) + { + LLFoundData found(linked_item->getUUID(), + linked_item->getAssetUUID(), + linked_item->getName(), + linked_item->getType(), + linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID + ); + found.mWearable = mWearable; + mHolder->mFoundList.push_front(found); + } + else + { + llwarns << "inventory item not found for recovered wearable" << llendl; + } } else { - llwarns << "inventory item or link not found for recovered wearable" << llendl; + llwarns << "inventory link not found for recovered wearable" << llendl; } } private: -- cgit v1.3 From 1394d21b7a525c4cbe6780dbd478d3bf2f946fa3 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 2 Mar 2010 09:53:52 +0000 Subject: 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(-) (limited to 'indra/newview/llappearancemgr.cpp') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 03782510f2..5c21be8c32 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -575,12 +575,16 @@ public: mWearable->setItemID(item_id); LLPointer 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; -- cgit v1.3