From d785694c87e9f7fb9e4b593bc1927da5ea94cf91 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 14 Nov 2021 22:25:40 +0100 Subject: [PATCH] Remote Input: prevent nullptr --- .../samplesource/remoteinput/remoteinputbuffer.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/samplesource/remoteinput/remoteinputbuffer.cpp b/plugins/samplesource/remoteinput/remoteinputbuffer.cpp index b37e3fba3..80882c63c 100644 --- a/plugins/samplesource/remoteinput/remoteinputbuffer.cpp +++ b/plugins/samplesource/remoteinput/remoteinputbuffer.cpp @@ -394,10 +394,14 @@ uint8_t *RemoteInputBuffer::readData(int32_t length) m_readSize = length; } - std::memcpy((void *) m_readBuffer, (const void *) &buffer[m_readIndex], m_framesNbBytes - m_readIndex); // copy end of buffer - length -= m_framesNbBytes - m_readIndex; - std::memcpy((void *) &m_readBuffer[m_framesNbBytes - m_readIndex], (const void *) buffer, length); // copy start of buffer - m_readIndex = length; + if (m_readBuffer) + { + std::memcpy((void *) m_readBuffer, (const void *) &buffer[m_readIndex], m_framesNbBytes - m_readIndex); // copy end of buffer + length -= m_framesNbBytes - m_readIndex; + std::memcpy((void *) &m_readBuffer[m_framesNbBytes - m_readIndex], (const void *) buffer, length); // copy start of buffer + m_readIndex = length; + } + return m_readBuffer; } }