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

Accepting request 673353 from X11:XOrg

Browse Source 
- Update to version 1.0.9:
  * Update configure.ac bug URL for gitlab migration
  * autogen.sh: use quoted string variables
  * autogen: add default patch prefix
  * autogen.sh: use exec instead of waiting for configure to finish
  * XauFileName: always go through buf allocation if buf is NULL
  * XauFileName: reset bsize when malloc failed
  * AuDispose.c:remove redundant null check on calling free()
  * AuFileName.c: remove redundant null check on calling free()
  * AuRead.c: remove redundant null check on calling free()
  * Avoid out of boundary read access
- supersedes U_0001-XauFileName-reset-bsize-when-malloc-failed.patch,
  U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch

OBS-URL: https://build.opensuse.org/request/show/673353
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libXau?expand=0&rev=10
This commit is contained in:
Stephan Kulow 2019-02-24 15:58:48 +00:00 committed by Git OBS Bridge
commit bd567ce3ab
6 changed files with 24 additions and 69 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
View File

@ -1,32 +0,0 @@
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
View File

@ -1,27 +0,0 @@
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

3
libXau-1.0.8.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2
size 295297

3
libXau-1.0.9.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec
size 322650

17
libXau.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Feb 11 11:15:25 UTC 2019 - sndirsch@suse.com
- Update to version 1.0.9:
* Update configure.ac bug URL for gitlab migration
* autogen.sh: use quoted string variables
* autogen: add default patch prefix
* autogen.sh: use exec instead of waiting for configure to finish
* XauFileName: always go through buf allocation if buf is NULL
* XauFileName: reset bsize when malloc failed
* AuDispose.c:remove redundant null check on calling free()
* AuFileName.c: remove redundant null check on calling free()
* AuRead.c: remove redundant null check on calling free()
* Avoid out of boundary read access
- supersedes U_0001-XauFileName-reset-bsize-when-malloc-failed.patch,
U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch
-------------------------------------------------------------------
Mon Sep 30 10:12:46 UTC 2013 - sndirsch@suse.com

11
libXau.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libXau
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
Name: libXau
%define lname libXau6
Version: 1.0.8
Version: 1.0.9
Release: 0
Summary: X11 authorization protocol library
License: MIT
@ -28,8 +28,7 @@ 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
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#git#BuildRequires: autoconf >= 2.60, automake
BuildRequires: fdupes
@ -47,8 +46,8 @@ know a server-specific key called a "magic cookie".
%package -n %lname
Summary: X11 authorization protocol library
Group: System/Libraries
# O/P added for 12.2
Group: System/Libraries
Provides: xorg-x11-libXau = 7.6_%version-%release
Obsoletes: xorg-x11-libXau < 7.6_%version-%release
@ -79,8 +78,6 @@ in %lname.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%build
%configure --disable-static