Skip to content

Crash fixes #4301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: 2025.05 to develop
merged 2 commits into from
Jun 27, 2025
Merged

Crash fixes #4301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67b6b8
#4298 Crash at generateVertexRemapMulti
akleshchev Jun 27, 2025
f0a3665
#4300 Crash at readProfileQuery
akleshchev Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion indra/llmath/llvolume.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5711,7 +5711,15 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
S32 vert_count = 0;
if (!data.p.empty())
{
vert_count = static_cast<S32>(meshopt_generateVertexRemapMulti(&remap[0], nullptr, data.p.size(), data.p.size(), mos, stream_count));
try
{
vert_count = static_cast<S32>(meshopt_generateVertexRemapMulti(&remap[0], nullptr, data.p.size(), data.p.size(), mos, stream_count));
}
catch (std::bad_alloc&)
{
LLError::LLUserWarningMsg::showOutOfMemory();
LL_ERRS("LLCoros") << "Failed to allocate memory for VertexRemap: " << (S32)data.p.size() << LL_ENDL;
}
}

if (vert_count < 65535 && vert_count != 0)
Expand Down
22 changes: 15 additions & 7 deletions indra/newview/llvoavatar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11782,16 +11782,24 @@ void LLVOAvatar::readProfileQuery(S32 retries)

}
else
{ // wait until next frame
LLUUID id = getID();
{
// wait until next frame
const LLUUID id = getID();

LL::WorkQueue::getInstance("mainloop")->post([id, retries] {
LLVOAvatar* avatar = (LLVOAvatar*) gObjectList.findObject(id);
if(avatar)
LL::WorkQueue::getInstance("mainloop")->post([id, retries]
{
LLViewerObject* object = gObjectList.findObject(id);
if (object
&& !object->isDead()
&& object->isAvatar()) // probably excessive, pcode isn't supposed to change
{
avatar->readProfileQuery(retries);
LLVOAvatar* avatar = (LLVOAvatar*)object;
if (avatar)
{
avatar->readProfileQuery(retries);
}
}
});
});
}
}

Expand Down