From 9a1178df1ae2e94f58c1708f6612966c9ea51e9e Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 17 Mar 2020 00:18:58 -0400
Subject: [PATCH] Fix a potential crash and a small opt to LLMaterialMgr
---
indra/llcommon/llsd.cpp | 2 +-
indra/newview/llmaterialmgr.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp
index f566a679c53..e9f6bb80f17 100644
--- a/indra/llcommon/llsd.cpp
+++ b/indra/llcommon/llsd.cpp
@@ -937,7 +937,7 @@ static const char *llsd_dump(const LLSD &llsd, bool useXMLFormat)
out << LLSDNotationStreamer(llsd);
out_string = out.str();
}
- int len = out_string.length();
+ size_t len = out_string.length();
sStorage = new char[len + 1];
memcpy(sStorage, out_string.c_str(), len);
sStorage[len] = '\0';
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
index c7d52e4c325..43c944791ca 100644
--- a/indra/newview/llmaterialmgr.cpp
+++ b/indra/newview/llmaterialmgr.cpp
@@ -330,8 +330,8 @@ void LLMaterialMgr::put(const LLUUID& object_id, const U8 te, const LLMaterial&
if (mPutQueue.end() == itQueue)
{
LL_DEBUGS("Materials") << "mPutQueue insert object " << object_id << LL_ENDL;
- mPutQueue.insert(std::pair<LLUUID, facematerial_map_t>(object_id, facematerial_map_t()));
- itQueue = mPutQueue.find(object_id);
+ auto ret = mPutQueue.insert(std::pair<LLUUID, facematerial_map_t>(object_id, facematerial_map_t()));
+ itQueue = ret.first;
}
facematerial_map_t::iterator itFace = itQueue->second.find(te);
--
GitLab