From 5270b9ed0ca6fad00a944464b23db0c4ad7d0dad Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 7 Oct 2014 09:32:31 +0200 Subject: [PATCH] htsp server: fix missing tcp_connection_land() call, caused memory corruptions --- src/htsp_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/htsp_server.c b/src/htsp_server.c index 59059ee5..09402c56 100644 --- a/src/htsp_server.c +++ b/src/htsp_server.c @@ -2346,7 +2346,7 @@ htsp_read_loop(htsp_connection_t *htsp) while(tvheadend_running) { readmsg: if((r = htsp_read_message(htsp, &m, 0)) != 0) - return r; + break; pthread_mutex_lock(&global_lock); if (htsp_authenticate(htsp, m)) { @@ -2406,7 +2406,7 @@ readmsg: pthread_mutex_lock(&global_lock); tcp_connection_land(tcp_id); pthread_mutex_unlock(&global_lock); - return 0; + return tvheadend_running ? r : 0; } /**