From: Adam Sutton Date: Mon, 3 Dec 2012 14:59:47 +0000 (+0000) Subject: timeshift: Remove redundant (and faulty) code. X-Git-Tag: v3.5~143 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=869f95ee0f93c90d2382550678b82cddecb0126f;p=thirdparty%2Ftvheadend.git timeshift: Remove redundant (and faulty) code. This appears to have been left in place from an older implementation. Ultimately the call to pthread_join will operate on uninit'd memory and could in certain circumstances cause a crash. Thanks goes to Seri Al-Najjar for spotting this. --- diff --git a/src/timeshift.c b/src/timeshift.c index 116575135..2114442e8 100644 --- a/src/timeshift.c +++ b/src/timeshift.c @@ -126,7 +126,6 @@ timeshift_destroy(streaming_target_t *pad) /* Wait for all threads */ pthread_join(ts->rd_thread, NULL); pthread_join(ts->wr_thread, NULL); - pthread_join(ts->rm_thread, NULL); /* Shut stuff down */ streaming_queue_deinit(&ts->wr_queue); diff --git a/src/timeshift/private.h b/src/timeshift/private.h index 455fd93b8..22022ac14 100644 --- a/src/timeshift/private.h +++ b/src/timeshift/private.h @@ -88,9 +88,6 @@ typedef struct timeshift { pthread_t rd_thread; ///< Reader thread th_pipe_t rd_pipe; ///< Message passing to reader - pthread_t rm_thread; ///< Reaper thread - timeshift_file_list_t rm_list; ///< Remove files - pthread_mutex_t rdwr_mutex; ///< Buffer protection timeshift_file_list_t files; ///< List of files