From 16ec154ea14f59f5807933ed05534b2536b62ce8 Mon Sep 17 00:00:00 2001
From: jcdr428 <jessiedeer@hotmail.com>
Date: Sat, 22 Jan 2022 19:34:40 +0100
Subject: [PATCH] Fix hevc memory leak

A, HevcSliceHeader member with a new dynamic variable m_nalBuffer is created every time the intDecodeNal method is called.

This commit fixes the leak.
---
 tsMuxer/hevcStreamReader.cpp | 22 ++++++++++++----------
 tsMuxer/hevcStreamReader.h   |  1 +
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/tsMuxer/hevcStreamReader.cpp b/tsMuxer/hevcStreamReader.cpp
index ca57657..7f76f58 100644
--- a/tsMuxer/hevcStreamReader.cpp
+++ b/tsMuxer/hevcStreamReader.cpp
@@ -17,7 +17,8 @@ HEVCStreamReader::HEVCStreamReader()
       m_vps(0),
       m_sps(0),
       m_pps(0),
-      m_hdr(new HevcHdrUnit),
+      m_hdr(new HevcHdrUnit()),
+      m_slice(0),
       m_firstFrame(true),
       m_frameNum(0),
       m_fullPicOrder(0),
@@ -44,7 +45,6 @@ HEVCStreamReader::~HEVCStreamReader()
 CheckStreamRez HEVCStreamReader::checkStream(uint8_t* buffer, int len)
 {
     CheckStreamRez rez;
-    HevcSliceHeader slice;
 
     uint8_t* end = buffer + len;
     for (uint8_t* nal = NALUnit::findNextNAL(buffer, end); nal < end - 4; nal = NALUnit::findNextNAL(nal, end))
@@ -105,10 +105,12 @@ CheckStreamRez HEVCStreamReader::checkStream(uint8_t* buffer, int len)
         // check Frame Depth on first slices
         if (isSlice(nalType) && (nal[2] & 0x80))
         {
-            slice.decodeBuffer(nal, FFMIN(nal + MAX_SLICE_HEADER, nextNal));
-            if (slice.deserialize(m_sps, m_pps))
+            if (!m_slice)
+                m_slice = new HevcSliceHeader();
+            m_slice->decodeBuffer(nal, FFMIN(nal + MAX_SLICE_HEADER, nextNal));
+            if (m_slice->deserialize(m_sps, m_pps))
                 return rez;  // not enough buffer or error
-            m_fullPicOrder = toFullPicOrder(&slice, m_sps->log2_max_pic_order_cnt_lsb);
+            m_fullPicOrder = toFullPicOrder(m_slice, m_sps->log2_max_pic_order_cnt_lsb);
             incTimings();
         }
     }
@@ -506,15 +508,15 @@ int HEVCStreamReader::intDecodeNAL(uint8_t* buff)
                 }
                 else
                 {  // first slice of current frame
-                    HevcSliceHeader slice;
-                    slice.decodeBuffer(curPos, FFMIN(curPos + MAX_SLICE_HEADER, nextNal));
-                    rez = slice.deserialize(m_sps, m_pps);
+                    if (!m_slice)
+                        m_slice = new HevcSliceHeader();
+                    m_slice->decodeBuffer(curPos, FFMIN(curPos + MAX_SLICE_HEADER, nextNal));
+                    rez = m_slice->deserialize(m_sps, m_pps);
                     if (rez)
                         return rez;  // not enough buffer or error
-                    // if (slice.slice_type == HEVC_IFRAME_SLICE)
                     if (nalType >= HevcUnit::NalType::BLA_W_LP)
                         m_lastIFrame = true;
-                    m_fullPicOrder = toFullPicOrder(&slice, m_sps->log2_max_pic_order_cnt_lsb);
+                    m_fullPicOrder = toFullPicOrder(m_slice, m_sps->log2_max_pic_order_cnt_lsb);
                 }
             }
             sliceFound = true;
diff --git a/tsMuxer/hevcStreamReader.h b/tsMuxer/hevcStreamReader.h
index 62149f6..4f6533b 100644
--- a/tsMuxer/hevcStreamReader.h
+++ b/tsMuxer/hevcStreamReader.h
@@ -50,6 +50,7 @@ class HEVCStreamReader : public MPEGStreamReader
     HevcSpsUnit* m_sps;
     HevcPpsUnit* m_pps;
     HevcHdrUnit* m_hdr;
+    HevcSliceHeader* m_slice;
     bool m_firstFrame;
 
     int m_frameNum;