diff --git a/U_libXrandr_fix-memory-leak.patch b/U_libXrandr_fix-memory-leak.patch new file mode 100644 index 0000000..41dcef7 --- /dev/null +++ b/U_libXrandr_fix-memory-leak.patch @@ -0,0 +1,48 @@ +From 87227e5fc79750d3eccc3c3482a3c5b3f2af2e90 Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Sat, 28 Jan 2017 15:37:57 +0100 +Subject: Fix memory leak on error paths + +Introduced in commit a0df3e1c7728205e5c7650b2e6dce684139254a6 "Avoid out +of boundary accesses on illegal responses" + +Signed-off-by: Julien Cristau + +diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c +index 6665092..8316b78 100644 +--- a/src/XrrCrtc.c ++++ b/src/XrrCrtc.c +@@ -459,6 +459,7 @@ XRRGetCrtcTransform (Display *dpy, + e = extra; + + if (e + rep.pendingNbytesFilter > end) { ++ XFree (attr); + XFree (extra); + return False; + } +@@ -468,6 +469,7 @@ XRRGetCrtcTransform (Display *dpy, + for (p = 0; p < rep.pendingNparamsFilter; p++) { + INT32 f; + if (e + 4 > end) { ++ XFree (attr); + XFree (extra); + return False; + } +@@ -478,6 +480,7 @@ XRRGetCrtcTransform (Display *dpy, + attr->pendingNparams = rep.pendingNparamsFilter; + + if (e + rep.currentNbytesFilter > end) { ++ XFree (attr); + XFree (extra); + return False; + } +@@ -487,6 +490,7 @@ XRRGetCrtcTransform (Display *dpy, + for (p = 0; p < rep.currentNparamsFilter; p++) { + INT32 f; + if (e + 4 > end) { ++ XFree (attr); + XFree (extra); + return False; + } +-- +cgit v0.10.2 diff --git a/libXrandr.changes b/libXrandr.changes index cdeaf7f..0a6d5fd 100644 --- a/libXrandr.changes +++ b/libXrandr.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 22 10:08:09 UTC 2017 - zaitor@opensuse.org + +- Add U_libXrandr_fix-memory-leak.patch: Fix memory leak on error + paths. +- Drop unneeded autoconf, automake and libtool BuildRequires and no + longer pass autoreconf. + ------------------------------------------------------------------- Mon May 29 14:26:07 UTC 2017 - sndirsch@suse.com diff --git a/libXrandr.spec b/libXrandr.spec index fa99102..ebf5960 100644 --- a/libXrandr.spec +++ b/libXrandr.spec @@ -29,12 +29,11 @@ Url: http://xorg.freedesktop.org/ #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXrandr/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 Source1: baselibs.conf +Patch: U_libXrandr_fix-memory-leak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf >= 2.60 -BuildRequires: automake +#git#BuildRequires: autoconf >= 2.60, automake, libtool BuildRequires: fdupes -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(randrproto) >= 1.5 BuildRequires: pkgconfig(renderproto) @@ -73,9 +72,10 @@ in %lname. %prep %setup -q +%patch -p1 %build -autoreconf -fi +#git#autoreconf -fi %configure --disable-static make %{?_smp_mflags}