pool/libXau
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 201452 from X11:XOrg

Browse Source 
- U_0001-XauFileName-reset-bsize-when-malloc-failed.patch/
  U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch
  * fixes regression in libXau 1.0.8, which resulted in a crash in
    Mozilla (bnc#831620,fdo#69929)

OBS-URL: https://build.opensuse.org/request/show/201452
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libXau?expand=0&rev=8
This commit is contained in:
Tomáš Chvátal 2013-09-30 16:12:01 +00:00 committed by Git OBS Bridge
commit b28cfcbdf7
4 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
U_0001-XauFileName-reset-bsize-when-malloc-failed.patch Normal file
View File

@ -0,0 +1,32 @@
From 67beb3d0bc41c3416902c858f595b35306f76704 Mon Sep 17 00:00:00 2001
From: Fuminobu TAKEYAMA <ftake@geeko.jp>
Date: Sun, 29 Sep 2013 09:21:05 -0700
Subject: [PATCH 1/2] XauFileName: reset bsize when malloc failed
https://bugs.freedesktop.org/show_bug.cgi?id=69929
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
AuFileName.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/AuFileName.c b/AuFileName.c
index 0904273..63d4956 100644
--- a/AuFileName.c
+++ b/AuFileName.c
@@ -70,8 +70,10 @@ XauFileName (void)
if (buf)
free (buf);
buf = malloc (size);
- if (!buf)
+ if (!buf) {
+ bsize = 0;
return NULL;
+ }
if (!atexit_registered) {
atexit(free_filename_buffer);
--
1.8.1.4

27
U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch Normal file
View File

@ -0,0 +1,27 @@
From 304a11be4727c5a7feeb2501e8e001466f8ce84e Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 29 Sep 2013 09:23:45 -0700
Subject: [PATCH 2/2] XauFileName: always go through buf allocation if buf is
NULL
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
AuFileName.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/AuFileName.c b/AuFileName.c
index 63d4956..7cedfcc 100644
--- a/AuFileName.c
+++ b/AuFileName.c
@@ -66,7 +66,7 @@ XauFileName (void)
return NULL;
}
size = strlen (name) + strlen(&slashDotXauthority[1]) + 2;
- if (size > bsize) {
+ if ((size > bsize) || (buf == NULL)) {
if (buf)
free (buf);
buf = malloc (size);
--
1.8.1.4

8
libXau.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Sep 30 10:12:46 UTC 2013 - sndirsch@suse.com
- U_0001-XauFileName-reset-bsize-when-malloc-failed.patch/
U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch
* fixes regression in libXau 1.0.8, which resulted in a crash in
Mozilla (bnc#831620,fdo#69929)
-------------------------------------------------------------------
Wed May 29 22:21:50 UTC 2013 - tobias.johannes.klausmann@mni.thm.de

4
libXau.spec
View File

@ -28,6 +28,8 @@ Url: http://xorg.freedesktop.org/
#Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXau
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libXau/
Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
Patch1: U_0001-XauFileName-reset-bsize-when-malloc-failed.patch
Patch2: U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#git#BuildRequires: autoconf >= 2.60, automake
BuildRequires: fdupes
@ -77,6 +79,8 @@ in %lname.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%build
%configure --disable-static