backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: UB with LivingEntities::pushEntities

Browse source
This commit is contained in:
Tropical 2026-04-11 09:56:20 -07:00
parent 76788f1708
commit f7e555ea6b
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
targets/minecraft/client/Minecraft.cpp
View file

@ -485,7 +485,7 @@ File Minecraft::getWorkingDirectory(const std::string& applicationName) {
return workingDirectory; return workingDirectory;
} else { } else {
Log::info("Could not locate user's home directory. This platform is likely missing an implementation of Minecraft::getWorkingDirectory."); Log::info("Could not locate user's home directory. This platform is likely missing an implementation of Minecraft::getWorkingDirectory.\n");
assert(0); assert(0);
} }
} }

14
targets/minecraft/world/entity/LivingEntity.cpp
View file

@ -1604,11 +1604,15 @@ void LivingEntity::pushEntities() {
AABB grown = bb.grow(0.2, 0, 0.2); AABB grown = bb.grow(0.2, 0, 0.2);
std::vector<std::shared_ptr<Entity>>* entities = std::vector<std::shared_ptr<Entity>>* entities =
level->getEntities(shared_from_this(), &grown); level->getEntities(shared_from_this(), &grown);
if (entities != nullptr && !entities->empty()) {
auto itEnd = entities->end(); if (entities == nullptr || entities->empty()) {
for (auto it = entities->begin(); it != itEnd; it++) { return;
std::shared_ptr<Entity> e = *it; // entities->at(i); }
if (e and !e->removed and e->isPushable()) push(e);
std::vector<std::shared_ptr<Entity>> prev_entities = *entities;
for (const std::shared_ptr<Entity>& e : prev_entities) {
if (e && !e->removed && e->isPushable()) {
push(e);
} }
} }
} }