Merge pull request #83 from hbeni/fixMemleaks

Fix #81 memleaks
hbeni · Feb 17, 2021 · f8acbfa · f8acbfa
2 parents 98831ec + 3daa24d
commit f8acbfa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/client/mumble-plugin/fgcom-mumble.cpp b/client/mumble-plugin/fgcom-mumble.cpp
@@ -210,7 +210,6 @@ void fgcom_updateClientComment() {
         const char *comment;
         if (mumAPI.getUserComment(ownPluginID, activeConnection, localMumId, &comment) == STATUS_OK) {
             std::string comment_str(comment);
-            mumAPI.freeMemory(ownPluginID, &comment);
             std::smatch sm;
             std::regex re("^([\\w\\W]*)<p name=\"FGCOM\">.*");  // cool trick: . does not match newline, but \w with negated \W matches really everything
             //pluginDbg("fgcom_updateClientComment(): got previous comment: '"+comment_str+"'");
@@ -221,7 +220,8 @@ void fgcom_updateClientComment() {
                 preservedComment = comment_str;
             }
         }
-
+        mumAPI.freeMemory(ownPluginID, comment);
+
         // Add FGCom generic infos
         newComment += "<b>FGCom</b> (v"+std::to_string(FGCOM_VERSION_MAJOR)+"."+std::to_string(FGCOM_VERSION_MINOR)+"."+std::to_string(FGCOM_VERSION_PATCH)+"): ";
         newComment += (fgcom_isPluginActive())? "active" : "inactive";
@@ -424,7 +424,6 @@ mumble_error_t fgcom_initPlugin() {
                 }
                 fgcom_remotecfg_mtx.unlock();
                 pluginLog("got local clientID="+std::to_string(localUser));
-                mumAPI.freeMemory(ownPluginID, &localUser);
             }
 
 
@@ -483,7 +482,6 @@ mumble_error_t fgcom_initPlugin() {
                 pluginLog("Error fetching current active channel: rc="+std::to_string(glcres));
                 return EC_CHANNEL_NOT_FOUND; // abort online init - something horribly went wrong.
             }
-            mumAPI.freeMemory(ownPluginID, &localChannelID);
 
             if (!fgcom_isPluginActive()) fgcom_setPluginActive(fgcom_isPluginActive()); // print some nice message to start
 

diff --git a/client/mumble-plugin/lib/io_plugin.cpp b/client/mumble-plugin/lib/io_plugin.cpp
@@ -258,13 +258,11 @@ void notifyRemotes(int iid, FGCOM_NOTIFY_T what, int selector, mumble_userid_t t
     mumble_channelid_t localChannelID;
     if (mumAPI.getChannelOfUser(ownPluginID, activeConnection, localMumId, &localChannelID) != STATUS_OK) {
         pluginLog("[ERROR]: Can't obtain channel of local user");
-        mumAPI.freeMemory(ownPluginID, &localChannelID);
         return;
     }
 
     if (mumAPI.getUsersInChannel(ownPluginID, activeConnection, localChannelID, &userIDs, &userCount) != STATUS_OK) {
         pluginLog("[ERROR]: Can't obtain user list");
-        mumAPI.freeMemory(ownPluginID, &localChannelID);
         return;
     } else {
         pluginDbg("There are "+std::to_string(userCount)+" users on this channel.");
@@ -308,7 +306,6 @@ void notifyRemotes(int iid, FGCOM_NOTIFY_T what, int selector, mumble_userid_t t
 
         }
 
-        mumAPI.freeMemory(ownPluginID, &localChannelID);
         mumAPI.freeMemory(ownPluginID, userIDs);
         pluginDbg("  notification for dataID='"+dataID+"' done.");
     }