DVR: fix sigsegv in dvr thread, fixes #3260

tvheadend · Nov 3, 2015 · 646a663 · 646a663
1 parent 6d96358
commit 646a663
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
@@ -1386,8 +1386,10 @@ dvr_thread(void *aux)
 	start_time = 0;
 	started = 0;
 	muxing = 0;
-	streaming_start_unref(ss);
-	ss = NULL;
+	if (ss) {
+	  streaming_start_unref(ss);
+	  ss = NULL;
+        }
       }
       break;
 
@@ -1450,6 +1452,9 @@ dvr_thread(void *aux)
   if (prch->prch_muxer)
     dvr_thread_epilog(de, postproc);
 
+  if (ss)
+    streaming_start_unref(ss);
+
   free(postproc);
   return NULL;
 }