Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tizen.Core] Fix memory leak #6336

Merged
merged 1 commit into from
Sep 20, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/Tizen.Core/Tizen.Core/ChannelObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using System;
using System.Collections.Concurrent;
using System.Runtime.InteropServices;
using System.Security.Cryptography;

namespace Tizen.Core
{
Expand All @@ -30,7 +31,7 @@ public class ChannelObject : IDisposable
private bool _disposed = false;
private static readonly ConcurrentDictionary<int, object> _dataMap = new ConcurrentDictionary<int, object>();
private static readonly object _dataLock = new object();
private static int _dataId = 0;
private static int _dataId = 1;

/// <summary>
/// Constructor for creating a new channel object with specified ID and data.
Expand Down Expand Up @@ -109,8 +110,19 @@ public object Data
set
{
int id;
Interop.LibTizenCore.TizenCoreChannel.ObjectGetData(_handle, out IntPtr handle);
if (handle != IntPtr.Zero)
{
id = (int)handle;
_dataMap.TryRemove(id, out var _);
}

lock (_dataLock)
{
if (_dataId + 1 < 0)
{
_dataId = 1;
}
id = _dataId++;
}
_dataMap[id] = value;
Expand Down
Loading