Fix dynamic-stack-buffer-overflow crash when executing random functions on random physics objects

jamie-pate · jamie-pate · commit eb5f1299b2a5 · 2024-07-18T19:22:03.000-07:00
Fixes godotengine#92333 This looks correct, and fixes the ASAN assertion I'm currently getting in my program.
diff --git a/scene/3d/physics/rigid_body_3d.cpp b/scene/3d/physics/rigid_body_3d.cpp
@@ -249,7 +249,7 @@ void RigidBody3D::_body_state_changed(PhysicsDirectBodyState3D *p_state) {
 		//process additions
 
 		for (int i = 0; i < toadd_count; i++) {
-			_body_inout(1, toremove[i].rid, toadd[i].id, toadd[i].shape, toadd[i].local_shape);
+			_body_inout(1, toadd[i].rid, toadd[i].id, toadd[i].shape, toadd[i].local_shape);
 		}
 
 		contact_monitor->locked = false;

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ void RigidBody3D::_body_state_changed(PhysicsDirectBodyState3D *p_state) {`
`249`	`249`	`//process additions`
`250`	`250`
`251`	`251`	`for (int i = 0; i < toadd_count; i++) {`
`252`		`- _body_inout(1, toremove[i].rid, toadd[i].id, toadd[i].shape, toadd[i].local_shape);`
	`252`	`+ _body_inout(1, toadd[i].rid, toadd[i].id, toadd[i].shape, toadd[i].local_shape);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`contact_monitor->locked = false;`