luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-19 03:05:29 +02:00
Code Activity

Client: protect against circular attachments (#16038)

Browse Source 
The server already includes such check. There must be a desync issue that causes
an ID mismatch, resulting in client crashes. Any such crash must be prevented.
This commit is contained in:
SmallJoker
2025-04-21 12:33:19 +02:00
committed by GitHub
parent c0e42c6588
commit 5c6e4d35b0
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/unit_sao.cpp
View File

@@ -128,8 +128,9 @@ void UnitSAO::setAttachment(const object_t new_parent, const std::string &bone,
};
// Do checks to avoid circular references
// See similar check in `GenericCAO::setAttachment` (but with different types).
{
auto *obj = new_parent ? m_env->getActiveObject(new_parent) : nullptr;
auto *obj = m_env->getActiveObject(new_parent);
if (obj == this) {
assert(false);
return;
@@ -145,7 +146,8 @@ void UnitSAO::setAttachment(const object_t new_parent, const std::string &bone,
}
}
if (problem) {
warningstream << "Mod bug: Attempted to attach object " << m_id << " to parent "
warningstream << "Mod bug: "
<< "Attempted to attach object " << m_id << " to parent "
<< new_parent << " but former is an (in)direct parent of latter." << std::endl;
return;
}