Fix for assert (and potential crash) in LLAvatarPropertiesProcessor coroutine (#3253)

RunitaiLinden · web-flow · commit 5f9fe87808bd · 2024-12-10T11:09:07.000-06:00
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -41,6 +41,7 @@
 #include "lltrans.h"
 #include "llui.h"               // LLUI::getLanguage()
 #include "message.h"
+#include "llappviewer.h"
 
 LLAvatarPropertiesProcessor::LLAvatarPropertiesProcessor()
 {
@@ -367,7 +368,11 @@ void LLAvatarPropertiesProcessor::requestAvatarPropertiesCoro(std::string cap_ur
         avatar_data.picks_list.emplace_back(pick_data["id"].asUUID(), pick_data["name"].asString());
     }
 
-    inst.notifyObservers(avatar_id, &avatar_data, type);
+    LLAppViewer::instance()->postToMainCoro(
+        [avatar_id, avatar_data, type]()
+        {
+            LLAvatarPropertiesProcessor::instance().notifyObservers(avatar_id, (void*) &avatar_data, type);
+        });
 }
 
 void LLAvatarPropertiesProcessor::processAvatarLegacyPropertiesReply(LLMessageSystem* msg, void**)

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`#include "lltrans.h"`
`42`	`42`	`#include "llui.h" // LLUI::getLanguage()`
`43`	`43`	`#include "message.h"`
	`44`	`+#include "llappviewer.h"`
`44`	`45`
`45`	`46`	`LLAvatarPropertiesProcessor::LLAvatarPropertiesProcessor()`
`46`	`47`	`{`
`@@ -367,7 +368,11 @@ void LLAvatarPropertiesProcessor::requestAvatarPropertiesCoro(std::string cap_ur`
`367`	`368`	`avatar_data.picks_list.emplace_back(pick_data["id"].asUUID(), pick_data["name"].asString());`
`368`	`369`	`}`
`369`	`370`
`370`		`- inst.notifyObservers(avatar_id, &avatar_data, type);`
	`371`	`+ LLAppViewer::instance()->postToMainCoro(`
	`372`	`+ [avatar_id, avatar_data, type]()`
	`373`	`+ {`
	`374`	`+ LLAvatarPropertiesProcessor::instance().notifyObservers(avatar_id, (void*) &avatar_data, type);`
	`375`	`+ });`
`371`	`376`	`}`
`372`	`377`
`373`	`378`	`void LLAvatarPropertiesProcessor::processAvatarLegacyPropertiesReply(LLMessageSystem* msg, void**)`