[Linux/Tizen] Replace g_free usages with GAutoPtr

src/platform/Linux/bluez/BluezEndpoint.cpp

@@ -287,7 +287,7 @@ CHIP_ERROR BluezEndpoint::RegisterGattApplicationImpl()
     GVariant * options = g_variant_builder_end(&optionsBuilder);
 
     bluez_gatt_manager1_call_register_application(
-        gattMgr.get(), mpRootPath, options, nullptr,
+        gattMgr.get(), mpRootPath.get(), options, nullptr,
         +[](GObject * aObj, GAsyncResult * aResult, void * self) {
             reinterpret_cast<BluezEndpoint *>(self)->RegisterGattApplicationDone(aObj, aResult);
         },
@@ -335,8 +335,8 @@ void BluezEndpoint::HandleNewDevice(BluezDevice1 & aDevice)
     VerifyOrExit(conn != nullptr, err = CHIP_ERROR_NO_MEMORY);
     SuccessOrExit(err = conn->Init(*this));
 
-    mpPeerDevicePath           = g_strdup(objectPath);
-    mConnMap[mpPeerDevicePath] = conn;
+    mpPeerDevicePath.reset(g_strdup(objectPath));
+    mConnMap[mpPeerDevicePath.get()] = conn;
 
     ChipLogDetail(DeviceLayer, "New BLE connection: conn=%p device=%s path=%s", conn, conn->GetPeerAddress(), objectPath);
 
@@ -369,9 +369,9 @@ BluezGattService1 * BluezEndpoint::CreateGattService(const char * aUUID)
     BluezObjectSkeleton * object;
     BluezGattService1 * service;
 
-    mpServicePath = g_strdup_printf("%s/service", mpRootPath);
-    ChipLogDetail(DeviceLayer, "CREATE service object at %s", mpServicePath);
-    object = bluez_object_skeleton_new(mpServicePath);
+    mpServicePath.reset(g_strdup_printf("%s/service", mpRootPath.get()));
+    ChipLogDetail(DeviceLayer, "CREATE service object at %s", mpServicePath.get());
+    object = bluez_object_skeleton_new(mpServicePath.get());
 
     service = bluez_gatt_service1_skeleton_new();
     bluez_gatt_service1_set_uuid(service, aUUID);
@@ -394,7 +394,7 @@ BluezConnection * BluezEndpoint::GetBluezConnection(const char * aPath)
 
 BluezConnection * BluezEndpoint::GetBluezConnectionViaDevice()
 {
-    return GetBluezConnection(mpPeerDevicePath);
+    return GetBluezConnection(mpPeerDevicePath.get());
 }
 
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
@@ -520,8 +520,8 @@ void BluezEndpoint::SetupGattServer(GDBusConnection * aConn)
 {
     VerifyOrReturn(!mIsCentral);
 
-    mpRootPath = g_strdup_printf("/chipoble/%04x", getpid() & 0xffff);
-    mRoot.reset(g_dbus_object_manager_server_new(mpRootPath));
+    mpRootPath.reset(g_strdup_printf("/chipoble/%04x", getpid() & 0xffff));
+    mRoot.reset(g_dbus_object_manager_server_new(mpRootPath.get()));
 
     SetupGattService();
 
@@ -586,10 +586,6 @@ void BluezEndpoint::Shutdown()
         },
         this);
 
-    g_free(mpRootPath);
-    g_free(mpServicePath);
-    g_free(mpPeerDevicePath);
-
     mIsInitialized = false;
 }
 

src/platform/Linux/bluez/BluezEndpoint.h

@@ -118,8 +118,8 @@ class BluezEndpoint : public BluezObjectManagerAdapterNotificationsDelegate
     bool mIsInitialized = false;
 
     // Paths for objects published by this service
-    char * mpRootPath    = nullptr;
-    char * mpServicePath = nullptr;
+    GAutoPtr<char> mpRootPath;
+    GAutoPtr<char> mpServicePath;
 
     // Objects (interfaces) published by this service
     GAutoPtr<GDBusObjectManagerServer> mRoot;
@@ -133,7 +133,7 @@ class BluezEndpoint : public BluezObjectManagerAdapterNotificationsDelegate
 
     std::unordered_map<std::string, BluezConnection *> mConnMap;
     GAutoPtr<GCancellable> mConnectCancellable;
-    char * mpPeerDevicePath = nullptr;
+    GAutoPtr<char> mpPeerDevicePath;
 
     // Allow BluezConnection to access our private members
     friend class BluezConnection;

src/platform/Tizen/DnssdImpl.cpp

@@ -29,6 +29,7 @@
 // Note: Include dns-sd-internal.h is needed, this source file uses some undocumented functions.
 #include <dns-sd-internal.h>
 #include <dns-sd.h>
+#include <glib-object.h>
 #include <glib.h>
 
 #include <inet/InetConfig.h>
@@ -336,7 +337,8 @@ void OnResolve(dnssd_error_e result, dnssd_service_h service, void * userData)
         err == CHIP_NO_ERROR,
         ChipLogError(DeviceLayer, "chip::Inet::InterfaceId::InterfaceNameToId() failed: %" CHIP_ERROR_FORMAT, err.Format()));
 
-    ret = dnssd_service_get_all_txt_record(service, &rCtx->mResultTxtRecordLen, reinterpret_cast<void **>(&rCtx->mResultTxtRecord));
+    ret = dnssd_service_get_all_txt_record(service, &rCtx->mResultTxtRecordLen,
+                                           reinterpret_cast<void **>(rCtx->mResultTxtRecord.out()));
     VerifyOrExit(ret == DNSSD_ERROR_NONE,
                  ChipLogError(DeviceLayer, "dnssd_service_get_all_txt_record() failed: %s", get_error_message(ret)));
 
@@ -462,19 +464,14 @@ ResolveContext::ResolveContext(DnssdTizen * instance, const char * name, const c
     mCbContext = context;
 }
 
-ResolveContext::~ResolveContext()
-{
-    g_free(mResultTxtRecord);
-}
-
 void ResolveContext::Finalize(CHIP_ERROR error)
 {
     ChipLogProgress(DeviceLayer, "DNSsd %s", __func__);
     // In case of error, run the callback function with nullptr as the result.
     VerifyOrReturn(error == CHIP_NO_ERROR, mCallback(mCbContext, nullptr, chip::Span<chip::Inet::IPAddress>(), error));
 
     std::vector<chip::Dnssd::TextEntry> textEntries;
-    GetTextEntries(mResultTxtRecordLen, mResultTxtRecord, textEntries);
+    GetTextEntries(mResultTxtRecordLen, mResultTxtRecord.get(), textEntries);
     mResult.mTextEntries   = textEntries.empty() ? nullptr : textEntries.data();
     mResult.mTextEntrySize = textEntries.size();
 

src/platform/Tizen/DnssdImpl.h

@@ -25,13 +25,15 @@
 #include <vector>
 
 #include <dns-sd.h>
+#include <glib-object.h>
 #include <glib.h>
 
 #include <inet/IPAddress.h>
 #include <inet/InetInterface.h>
 #include <lib/core/CHIPError.h>
 #include <lib/dnssd/Constants.h>
 #include <lib/dnssd/platform/Dnssd.h>
+#include <platform/GLibTypeDeleter.h>
 
 namespace chip {
 namespace Dnssd {
@@ -106,8 +108,8 @@ struct ResolveContext : public GenericContext
     bool mIsResolving              = false;
 
     // Resolved service
-    DnssdService mResult               = {};
-    uint8_t * mResultTxtRecord         = nullptr;
+    DnssdService mResult = {};
+    GAutoPtr<uint8_t> mResultTxtRecord;
     unsigned short mResultTxtRecordLen = 0;
 
     ResolveContext(DnssdTizen * instance, const char * name, const char * type, uint32_t interfaceId, DnssdResolveCallback callback,