From e51ad1a68a163c7200102f61c457577baa41d3dc Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 18 Apr 2019 19:26:13 -0700 Subject: [PATCH] Fix use-after-free due to stale m_FrontendRenderer pointer. Fixes #214 --- app/streaming/video/ffmpeg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/streaming/video/ffmpeg.cpp b/app/streaming/video/ffmpeg.cpp index 5bdcc6cf..87750fe5 100644 --- a/app/streaming/video/ffmpeg.cpp +++ b/app/streaming/video/ffmpeg.cpp @@ -124,11 +124,11 @@ void FFmpegVideoDecoder::reset() // If we have a separate frontend renderer, free that first if (m_FrontendRenderer != m_BackendRenderer) { delete m_FrontendRenderer; - m_FrontendRenderer = nullptr; } delete m_BackendRenderer; - m_BackendRenderer = nullptr; + + m_FrontendRenderer = m_BackendRenderer = nullptr; if (!m_TestOnly) { logVideoStats(m_GlobalVideoStats, "Global video stats");