From fef703874c7ad9930808b84038f46d8e61f20873 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Mon, 18 Feb 2019 14:09:22 -0500
Subject: [PATCH] encoder: fix race condition segfault in rtp_write_trailer
Change-Id: I5b036bd9285197934eae942c8c2c23d675bc69af
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
---
src/media/media_encoder.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index 14a47efba3..0e38a413f9 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -52,7 +52,8 @@ MediaEncoder::MediaEncoder()
MediaEncoder::~MediaEncoder()
{
if (outputCtx_) {
- av_write_trailer(outputCtx_);
+ if (outputCtx_->priv_data)
+ av_write_trailer(outputCtx_);
for (auto encoderCtx : encoders_) {
if (encoderCtx) {
#ifndef _MSC_VER
--
GitLab