Plug a memory leak in XListFonts()
This commit is contained in:
parent
6a33092584
commit
fa446d445a
36
0001-Plug-a-memory-leak.patch
Normal file
36
0001-Plug-a-memory-leak.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From 20a3f99eba5001925b8b313da3accb7900eb1927 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emilio Pozuelo Monfort <pochu@debian.org>
|
||||||
|
Date: Tue, 25 Oct 2016 21:30:15 +0200
|
||||||
|
Subject: [PATCH libX11] Plug a memory leak
|
||||||
|
|
||||||
|
This was introduced in 8ea762f.
|
||||||
|
|
||||||
|
Reported-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Signed-off-by: Emilio Pozuelo Monfort <pochu@debian.org>
|
||||||
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
---
|
||||||
|
src/FontNames.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/FontNames.c b/src/FontNames.c
|
||||||
|
index e55f338..3e23b5f 100644
|
||||||
|
--- a/src/FontNames.c
|
||||||
|
+++ b/src/FontNames.c
|
||||||
|
@@ -98,12 +98,14 @@ int *actualCount) /* RETURN */
|
||||||
|
*ch = '\0'; /* and replace with null-termination */
|
||||||
|
count++;
|
||||||
|
} else {
|
||||||
|
+ Xfree(ch);
|
||||||
|
Xfree(flist);
|
||||||
|
flist = NULL;
|
||||||
|
count = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
+ Xfree(ch);
|
||||||
|
Xfree(flist);
|
||||||
|
flist = NULL;
|
||||||
|
count = 0;
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
@ -5,7 +5,7 @@
|
|||||||
Summary: Core X11 protocol client library
|
Summary: Core X11 protocol client library
|
||||||
Name: libX11
|
Name: libX11
|
||||||
Version: 1.6.4
|
Version: 1.6.4
|
||||||
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
@ -19,6 +19,8 @@ Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.t
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Patch2: dont-forward-keycode-0.patch
|
Patch2: dont-forward-keycode-0.patch
|
||||||
|
Patch3: 0001-Plug-a-memory-leak.patch
|
||||||
|
|
||||||
BuildRequires: xorg-x11-util-macros >= 1.11
|
BuildRequires: xorg-x11-util-macros >= 1.11
|
||||||
BuildRequires: pkgconfig(xproto) >= 7.0.15
|
BuildRequires: pkgconfig(xproto) >= 7.0.15
|
||||||
BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
|
BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
|
||||||
@ -50,6 +52,7 @@ X.Org X11 libX11 development package
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
||||||
%patch2 -p1 -b .dont-forward-keycode-0
|
%patch2 -p1 -b .dont-forward-keycode-0
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -v --install --force
|
autoreconf -v --install --force
|
||||||
@ -109,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man5/*.5*
|
%{_mandir}/man5/*.5*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 05 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.4-2
|
||||||
|
- Plug a memory leak in XListFonts()
|
||||||
|
|
||||||
* Wed Oct 05 2016 Adam Jackson <ajax@redhat.com> - 1.6.4-1
|
* Wed Oct 05 2016 Adam Jackson <ajax@redhat.com> - 1.6.4-1
|
||||||
- libX11 1.6.4
|
- libX11 1.6.4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user