!14 [sync] PR-13: fix sender_seen memory leak
From: @openeuler-sync-bot Reviewed-by: @gaoruoshu Signed-off-by: @gaoruoshu
This commit is contained in:
commit
f03d264f56
48
huawei-fix-sender_seen-memory-leak.patch
Normal file
48
huawei-fix-sender_seen-memory-leak.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From 48c8032695fedbd92bb24a2c2d4c3a4d83732409 Mon Sep 17 00:00:00 2001
|
||||||
|
From: zhuofeng <zhuofeng2@huawei.com>
|
||||||
|
Date: Mon, 6 Mar 2023 15:19:06 +0800
|
||||||
|
Subject: [PATCH] fix sender_seen memory leak
|
||||||
|
|
||||||
|
---
|
||||||
|
slip/dbus/service.py | 17 +++++++++--------
|
||||||
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/slip/dbus/service.py b/slip/dbus/service.py
|
||||||
|
index 5d276f8..bf4cb77 100644
|
||||||
|
--- a/slip/dbus/service.py
|
||||||
|
+++ b/slip/dbus/service.py
|
||||||
|
@@ -224,11 +224,12 @@ class Object(with_metaclass(InterfaceType, dbus.service.Object)):
|
||||||
|
if not new_owner and (old_owner, conn) in Object.senders:
|
||||||
|
Object.senders.remove((old_owner, conn))
|
||||||
|
Object.connections_senders[conn].remove(old_owner)
|
||||||
|
+ if old_owner in Object.connections_smobjs:
|
||||||
|
+ Object.connections_smobjs[old_owner].remove()
|
||||||
|
+ del Object.connections_smobjs[old_owner]
|
||||||
|
|
||||||
|
if len(Object.connections_senders[conn]) == 0:
|
||||||
|
- Object.connections_smobjs[conn].remove()
|
||||||
|
del Object.connections_senders[conn]
|
||||||
|
- del Object.connections_smobjs[conn]
|
||||||
|
|
||||||
|
if not self.persistent and len(Object.senders) == 0 and \
|
||||||
|
Object.current_source is None:
|
||||||
|
@@ -251,10 +252,10 @@ class Object(with_metaclass(InterfaceType, dbus.service.Object)):
|
||||||
|
Object.senders.add((sender, self.connection))
|
||||||
|
if self.connection not in Object.connections_senders:
|
||||||
|
Object.connections_senders[self.connection] = set()
|
||||||
|
- Object.connections_smobjs[self.connection] = \
|
||||||
|
- self.connection.add_signal_receiver(
|
||||||
|
- handler_function=self._name_owner_changed,
|
||||||
|
- signal_name='NameOwnerChanged',
|
||||||
|
- dbus_interface='org.freedesktop.DBus',
|
||||||
|
- arg1=sender)
|
||||||
|
+ Object.connections_smobjs[sender] = \
|
||||||
|
+ self.connection.add_signal_receiver(
|
||||||
|
+ handler_function=self._name_owner_changed,
|
||||||
|
+ signal_name='NameOwnerChanged',
|
||||||
|
+ dbus_interface='org.freedesktop.DBus',
|
||||||
|
+ arg1=sender)
|
||||||
|
Object.connections_senders[self.connection].add(sender)
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -1,11 +1,13 @@
|
|||||||
Name: python-slip
|
Name: python-slip
|
||||||
Version: 0.6.5
|
Version: 0.6.5
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: Library for Python 2.x with Convenience, extension and workaround
|
Summary: Library for Python 2.x with Convenience, extension and workaround
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/nphilipp/%{name}
|
URL: https://github.com/nphilipp/%{name}
|
||||||
Source0: https://github.com/nphilipp/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
|
Source0: https://github.com/nphilipp/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
|
||||||
|
|
||||||
|
Patch9000: huawei-fix-sender_seen-memory-leak.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: python2 python2-devel python3 python3-devel
|
BuildRequires: python2 python2-devel python3 python3-devel
|
||||||
|
|
||||||
@ -49,7 +51,7 @@ Requires: pygtk2
|
|||||||
Auto-wrapping function for Python 2.x packages
|
Auto-wrapping function for Python 2.x packages
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
|
||||||
rm -rf %{py3dir}
|
rm -rf %{py3dir}
|
||||||
cp -a . %{py3dir}
|
cp -a . %{py3dir}
|
||||||
@ -96,6 +98,12 @@ cd ..
|
|||||||
%{python2_sitelib}/slip.gtk-%{version}-py%{python2_version}.egg-info
|
%{python2_sitelib}/slip.gtk-%{version}-py%{python2_version}.egg-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 14 2023 zhuofeng <zhuofeng@huawei.com> - 0.6.5-5
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix sender_seen memory leak
|
||||||
|
|
||||||
* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.6.5-4
|
* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.6.5-4
|
||||||
- provides python2-slip-dbus
|
- provides python2-slip-dbus
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user