fix crash on 0 byte RTCP packet

willamowius · Jan 5, 2021 · bc0287b · bc0287b
1 parent 125b097
commit bc0287b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/h460/h46018_h225.cxx b/src/h460/h46018_h225.cxx
@@ -1352,9 +1352,9 @@ PBoolean H46019UDPSocket::WriteMultiplexBuffer(const void * buf, PINDEX len, con
     m_multiMutex.Signal();
     m_multiBuffer++;
 
-    if (!rtpSocket) {
+    if (!rtpSocket && len > 0) {
         RTP_ControlFrame frame(len);
-        memcpy(frame.GetPointer(),buf,len);
+        memcpy(frame.GetPointer(), buf, len);
         if (frame.GetPayloadType() == RTP_ControlFrame::e_ApplDefined) {
             PTRACE(6, "H46024A\tReading RTCP Probe Packet.");
             PBYTEArray tempData;

diff --git a/src/rtp.cxx b/src/rtp.cxx
@@ -339,7 +339,8 @@ RTP_ControlFrame::RTP_ControlFrame(PINDEX sz)
 {
   compoundOffset = 0;
   compoundSize = 0;
-  theArray[0] = '\x80'; // Set version 2
+  if (sz > 0)
+    theArray[0] = '\x80'; // Set version 2
 }