From 6992f5421f8222e1edf872a8788d88016ba46f2b Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 3 Feb 2019 00:22:07 -0800 Subject: [PATCH] cscore: Avoid crash if invalid (null) source set in MjpegServer (#1585) Fixes robotpy/robotpy-cscore#60 --- cscore/src/main/native/cpp/MjpegServerImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cscore/src/main/native/cpp/MjpegServerImpl.cpp b/cscore/src/main/native/cpp/MjpegServerImpl.cpp index 9dd6f33c7d..f548f9c61a 100644 --- a/cscore/src/main/native/cpp/MjpegServerImpl.cpp +++ b/cscore/src/main/native/cpp/MjpegServerImpl.cpp @@ -111,13 +111,13 @@ class MjpegServerImpl::ConnThread : public wpi::SafeThread { void StartStream() { std::lock_guard lock(m_mutex); - m_source->EnableSink(); + if (m_source) m_source->EnableSink(); m_streaming = true; } void StopStream() { std::lock_guard lock(m_mutex); - m_source->DisableSink(); + if (m_source) m_source->DisableSink(); m_streaming = false; } };