From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 10 Aug 2017 21:29:31 +0000 (+0200)
Subject: comet: fix websocket message memory leak and invalid memory access, fixes #4527
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=302169813ebfc6860fcc7824e2463dede10c12eb;p=thirdparty%2Ftvheadend.git

comet: fix websocket message memory leak and invalid memory access, fixes #4527
---

diff --git a/src/webui/comet.c b/src/webui/comet.c
index b33eef69f..c30e1f838 100644
--- a/src/webui/comet.c
+++ b/src/webui/comet.c
@@ -397,8 +397,10 @@ comet_mailbox_ws_msg(http_connection_t *hc, comet_mailbox_t *cmb, int first, hts
   m = comet_message(cmb, first, 1);
   cmb->cmb_last_used = 0;
   pthread_mutex_unlock(&comet_mutex);
-  if (m)
+  if (m) {
     http_websocket_send_json(hc, m);
+    htsmsg_destroy(m);
+  }
 }
 
 /**
@@ -438,7 +440,8 @@ comet_mailbox_ws(http_connection_t *hc, const char *remain, void *opaque)
   }
 
   pthread_mutex_lock(&comet_mutex);
-  cmb->cmb_refcount--;
+  if (atomic_get(&comet_running))
+    cmb->cmb_refcount--;
   pthread_mutex_unlock(&comet_mutex);
 
   return res;