Merge pull request #2087 from wmdebrito/fix/mpegts-h264-sps-extradata-increase-buffer-backport

[mpegts] Enlarge H.264 SPS/PPS raw_data buffers to 256 bytes - backport

Author: CastagnaIT

lib/mpegts/mpegts/ES_h264.cpp

@@ -158,18 +158,30 @@ void ES_h264::Parse(STREAM_PKT* pkt)
       {
         if (m_streamData.sps[0].raw_data_size)
         {
-          uint8_t *ed(stream_info.extra_data);
-          stream_info.extra_data_size = 4 + m_streamData.sps[0].raw_data_size;
-          ed[0] = ed[1] = ed[2] = 0, ed[3] = 1, ed += 4;
-          memcpy(ed, m_streamData.sps[0].raw_data, m_streamData.sps[0].raw_data_size), ed += m_streamData.sps[0].raw_data_size;
+          uint8_t* ed = stream_info.extra_data;
+          const uint8_t* edEnd = stream_info.extra_data + sizeof(stream_info.extra_data);
+          stream_info.extra_data_size = 0;
+
+          // Append a parameter set NAL (SPS/PPS) as Annex B, bounded by the
+          // destination buffer to avoid overflowing stream_info.extra_data
+          auto appendNal = [&](const uint8_t* src, size_t n) -> bool {
+            if (ed + 4 + n > edEnd)
+            {
+              DBG(DEMUX_DBG_INFO, "H.264: stream_info.extra_data too small! %u\n",
+                  static_cast<unsigned int>(stream_info.extra_data_size + 4 + n));
+              return false;
+            }
+            ed[0] = ed[1] = ed[2] = 0, ed[3] = 1, ed += 4;
+            memcpy(ed, src, n), ed += n;
+            stream_info.extra_data_size += 4 + n;
+            return true;
+          };
+
+          appendNal(m_streamData.sps[0].raw_data, m_streamData.sps[0].raw_data_size);
           for (int i = 0; i < 256; ++i)
           {
             if (m_streamData.pps[i].raw_data_size)
-            {
-              ed[0] = ed[1] = ed[2] = 0, ed[3] = 1, ed += 4;
-              memcpy(ed, m_streamData.pps[i].raw_data, m_streamData.pps[i].raw_data_size), ed += m_streamData.pps[i].raw_data_size;
-              stream_info.extra_data_size += 4 + m_streamData.pps[i].raw_data_size;
-            }
+              appendNal(m_streamData.pps[i].raw_data, m_streamData.pps[i].raw_data_size);
           }
         }
         else

lib/mpegts/mpegts/ES_h264.h

@@ -28,15 +28,15 @@ namespace TSDemux
         int log2_max_pic_order_cnt_lsb;
         int delta_pic_order_always_zero_flag;
         int raw_data_size;
-        uint8_t raw_data[64];
+        uint8_t raw_data[256];
       } sps[256];
 
       struct PPS
       {
         uint8_t sps;
         uint8_t pic_order_present_flag;
         uint16_t raw_data_size;
-        uint8_t raw_data[64];
+        uint8_t raw_data[256];
       } pps[256];
 
       struct VCL_NAL

lib/mpegts/mpegts/elementaryStream.h

@@ -61,7 +61,7 @@ namespace TSDemux
     int                   bit_rate;
     int                   bits_per_sample;
     bool                  interlaced;
-    uint8_t               extra_data[512];
+    uint8_t               extra_data[1024];
     int                   extra_data_size;
   };