Fixing memory leaks in hevc_enc plugin code for Beamr SDK.

Author: mszym1

plugins/code/hevc_enc/beamr/src/hevc_enc_beamr.cpp

@@ -357,8 +357,15 @@ static Status close(HevcEncHandle handle) {
         if (state->encoder)
             state->encoder->close();
 
-        if (state->ctrl)
+        if (state->ctrl) {
             delete state->ctrl;
+            state->ctrl = nullptr;
+        }
+
+        if (state->encoder) {
+            delete state->encoder;
+            state->encoder = nullptr;
+        }
     }
     catch (std::exception& e) {
         state->ctrl->msg = std::string(e.what());

plugins/code/hevc_enc/beamr/src/hevc_enc_beamr_impl.cpp

@@ -116,8 +116,6 @@ Encoder::Encoder()
 
 Encoder::~Encoder() {
     FUNCTIONV_T(close);
-    if (outBuffer)
-        delete[] outBuffer;
 }
 
 std::string Encoder::getVersion() {
@@ -586,9 +584,8 @@ void Encoder::getNal(HevcEncOutput* out, uint64_t maxSize) {
         return;
 
     if (maxSize > outBufferSize) {
-        if (outBuffer)
-            delete[] outBuffer;
-        outBuffer = new uint8_t[maxSize];
+        outBufferMem.reset(new uint8_t[maxSize]);
+        outBuffer = outBufferMem.get();
         outBufferSize = maxSize;
     }
 

plugins/code/hevc_enc/beamr/src/hevc_enc_beamr_impl.h

@@ -44,6 +44,7 @@
 #include <string>
 #include <thread>
 #include <vector>
+#include <memory>
 
 #include "debugger.h"
 #include "hevc_enc_api.h"
@@ -146,6 +147,7 @@ class Encoder {
     hevce_settings_t settings;
     std::deque<vh3_Nal> qMS;
     std::vector<HevcEncNal> nal;
+    std::unique_ptr<uint8_t[]> outBufferMem;
     uint8_t* outBuffer{nullptr};
     uint64_t outBufferSize{0};
     uint64_t nalUnitsToRelease{0};