Clear RIDs of weight buffers when freeing to avoid double free

clayjohn · clayjohn · commit bafbde9f4ba0 · 2024-04-09T17:52:05.000-07:00
diff --git a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
@@ -130,9 +130,10 @@ void RenderSceneBuffersRD::cleanup() {
 	named_textures.clear();
 
 	// Clear weight_buffer / blur textures.
-	for (const WeightBuffers &weight_buffer : weight_buffers) {
+	for (WeightBuffers &weight_buffer : weight_buffers) {
 		if (weight_buffer.weight.is_valid()) {
 			RD::get_singleton()->free(weight_buffer.weight);
+			weight_buffer.weight = RID();
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,10 @@ void RenderSceneBuffersRD::cleanup() {`
`130`	`130`	`named_textures.clear();`
`131`	`131`
`132`	`132`	`// Clear weight_buffer / blur textures.`
`133`		`- for (const WeightBuffers &weight_buffer : weight_buffers) {`
	`133`	`+ for (WeightBuffers &weight_buffer : weight_buffers) {`
`134`	`134`	`if (weight_buffer.weight.is_valid()) {`
`135`	`135`	`RD::get_singleton()->free(weight_buffer.weight);`
	`136`	`+ weight_buffer.weight = RID();`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`	`}`