Star 111 fix memory leaks (#6)

STAR-111 Add scoped logging and update librist version

This fix adds a data member to keep track of logging ownership, fixing a
memory leak due to not freeing memory allocated by rist_logging_set().
It also updates to the latest librist version.

Author: petter-holmberg

CMakeLists.txt

@@ -20,7 +20,7 @@ include(ExternalProject)
 ExternalProject_Add(project_rist
         CONFIGURE_COMMAND ""
         GIT_REPOSITORY https://code.videolan.org/rist/librist.git
-        GIT_TAG v0.2.0
+        GIT_TAG v0.2.6
         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rist
         BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rist
         BUILD_COMMAND mkdir -p ${CMAKE_CURRENT_SOURCE_DIR}/rist/build && cd ${CMAKE_CURRENT_SOURCE_DIR}/rist/build && meson .. --default-library=static && ninja

RISTNet.cpp

@@ -236,11 +236,12 @@ bool RISTNetReceiver::initReceiver(std::vector<std::string> &rURLList,
 
     // Default log settings
     rist_logging_settings* lSettingsPtr = rSettings.mLogSetting.get();
-	lStatus = rist_logging_set(&lSettingsPtr, rSettings.mLogLevel, nullptr, nullptr, nullptr, stderr);
+    lStatus = rist_logging_set(&lSettingsPtr, rSettings.mLogLevel, nullptr, nullptr, nullptr, stderr);
+    mLoggingScope.reset(lSettingsPtr);
     if (lStatus) {
         LOGGER(true, LOGG_ERROR, "rist_logging_set failed.")
         return false;
-	}
+    }
 
 
     lStatus = rist_receiver_create(&mRistContext, rSettings.mProfile, rSettings.mLogSetting.get());
@@ -510,11 +511,12 @@ bool RISTNetSender::initSender(std::vector<std::tuple<std::string,int>> &rPeerLi
     int lStatus;
     // Default log settings
     rist_logging_settings* lSettingsPtr = rSettings.mLogSetting.get();
-	lStatus = rist_logging_set(&lSettingsPtr, rSettings.mLogLevel, nullptr, nullptr, nullptr, stderr);
+    lStatus = rist_logging_set(&lSettingsPtr, rSettings.mLogLevel, nullptr, nullptr, nullptr, stderr);
+    mLoggingScope.reset(lSettingsPtr);
     if (lStatus) {
         LOGGER(true, LOGG_ERROR, "rist_logging_set failed.")
         return false;
-	}
+    }
 
     lStatus = rist_sender_create(&mRistContext, rSettings.mProfile, 0, rSettings.mLogSetting.get());
     if (lStatus) {

RISTNet.h

@@ -277,6 +277,8 @@ class RISTNetReceiver {
   // The list of connected clients
   std::map<rist_peer *, std::shared_ptr<NetworkConnection>> mClientList;
 
+  std::unique_ptr<rist_logging_settings, decltype(&free)> mLoggingScope{nullptr, &free};
+
 };
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -492,6 +494,8 @@ class RISTNetSender {
   // The list of connected clients
   std::map<rist_peer *, std::shared_ptr<NetworkConnection>> mClientList;
 
+  std::unique_ptr<rist_logging_settings, decltype(&free)> mLoggingScope{nullptr, &free};
+
 };
 
 #endif //CPPRISTWRAPPER__RISTNET_H