SL-15501 Viewer crash with unprotected use of std::vector::front()

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 31b5cf9aaa..fd712ea5d0 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4267,6 +4267,17 @@ public:
 	}
 	virtual void done()
 	{
+        if (mComplete.size() <= 0)
+        {
+            // Ex: timeout
+            LL_WARNS() << "Failed to load data. Removing observer " << LL_ENDL;
+            gInventory.removeObserver(this);
+            doOnIdleOneTime(mCallable);
+
+            delete this;
+            return;
+        }
+
 		// What we do here is get the complete information on the
 		// items in the requested category, and set up an observer
 		// that will wait for that to happen.