commit c10ceab7e80f9d6eae9ad98254bf97f41a0de112
author Virtually Nick <necouchman@users.noreply.github.com> Fri Jun 26 14:19:39 2020 -0500
committer GitHub <noreply@github.com> Fri Jun 26 14:19:39 2020 -0500
tree c61880462b724f9368e672009c7f881f2b1a829b
parent 79c6e5787d38a2e793fe7d63c4c187d813855806
parent d34745a40b46c9818c12499db6db1d8e7344cdeb

GUACAMOLE-1114: Merge fix the destruction of some thread mutexes

src/common/clipboard.c

diff --git a/src/common/clipboard.c b/src/common/clipboard.c
index e02a7ca..227623e 100644
--- a/src/common/clipboard.c
+++ b/src/common/clipboard.c
@@ -46,7 +46,14 @@
 }
 
 void guac_common_clipboard_free(guac_common_clipboard* clipboard) {
+
+    /* Destroy lock */
+    pthread_mutex_destroy(&(clipboard->lock));
+
+    /* Free buffer */
     free(clipboard->buffer);
+
+    /* Free base structure */
     free(clipboard);
 }
 

src/protocols/rdp/print-job.c

diff --git a/src/protocols/rdp/print-job.c b/src/protocols/rdp/print-job.c
index 5a75c6e..7d711c0 100644
--- a/src/protocols/rdp/print-job.c
+++ b/src/protocols/rdp/print-job.c
@@ -631,6 +631,9 @@
     /* Wait for job to terminate */
     pthread_join(job->output_thread, NULL);
 
+    /* Destroy lock */
+    pthread_mutex_destroy(&(job->state_lock));
+
     /* Free base structure */
     free(job);