Commit 3dffb6c4 for guacamole.apache.org
commit 3dffb6c441a392ff4d0c1997e1e36c15aa0c0a48
Author: Palaash Jain <palaashjain1234bov@gmail.com>
Date: Sat Mar 28 10:28:42 2026 +0530
GUACAMOLE-2083: destroy frame locks after all display layers are freed
diff --git a/src/libguac/display.c b/src/libguac/display.c
index f4a0f656..957029b5 100644
--- a/src/libguac/display.c
+++ b/src/libguac/display.c
@@ -218,8 +218,6 @@ void guac_display_free(guac_display* display) {
/* All locks, FIFOs, etc. are now unused and can be safely destroyed */
guac_flag_destroy(&display->render_state);
guac_fifo_destroy(&display->ops);
- guac_rwlock_destroy(&display->last_frame.lock);
- guac_rwlock_destroy(&display->pending_frame.lock);
/* Free all layers within the pending_frame list (NOTE: This will also free
* those layers from the last_frame list) */
@@ -231,6 +229,9 @@ void guac_display_free(guac_display* display) {
while (display->last_frame.layers != NULL)
guac_display_free_layer(display->last_frame.layers);
+ guac_rwlock_destroy(&display->last_frame.lock);
+ guac_rwlock_destroy(&display->pending_frame.lock);
+
guac_mem_free(display);
}