forked from jengelh/wayland
wayland-1.13
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=73
This commit is contained in:
parent
936084b9c0
commit
1209cb3c47
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1
|
||||
size 379520
|
Binary file not shown.
3
wayland-1.13.0.tar.xz
Normal file
3
wayland-1.13.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51
|
||||
size 414508
|
BIN
wayland-1.13.0.tar.xz.sig
Normal file
BIN
wayland-1.13.0.tar.xz.sig
Normal file
Binary file not shown.
@ -1,50 +0,0 @@
|
||||
|
||||
m e8ad23266f36521215dcd7cfcc524e0ef67d66dd Mon Sep 17 00:00:00 2001
|
||||
From: Yong Bakos <ybakos@humanoriented.com>
|
||||
Date: Tue, 27 Sep 2016 13:03:48 -0500
|
||||
Subject: wl_array: Set data to invalid address after free
|
||||
|
||||
Explicitly set the data member to an invalid memory address during
|
||||
wl_array_release, such that re-using a freed wl_array without re-initializing
|
||||
causes a crash. In addition, this pointer assignment makes wl_array_release
|
||||
testable.
|
||||
|
||||
Define a constant for the invalid memory address, and add documentation about
|
||||
this behavior, starting at libwayland version 1.13.
|
||||
|
||||
See https://lists.freedesktop.org/archives/wayland-devel/2016-September/031116.html
|
||||
|
||||
Signed-off-by: Yong Bakos <ybakos@humanoriented.com>
|
||||
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
|
||||
[Pekka: remove the doc about crashing]
|
||||
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
|
||||
|
||||
diff --git a/src/wayland-private.h b/src/wayland-private.h
|
||||
index ac712d9..ef58ccf 100644
|
||||
--- a/src/wayland-private.h
|
||||
+++ b/src/wayland-private.h
|
||||
@@ -36,6 +36,9 @@
|
||||
|
||||
#include "wayland-util.h"
|
||||
|
||||
+/* Invalid memory address */
|
||||
+#define WL_ARRAY_POISON_PTR (void *) 4
|
||||
+
|
||||
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
|
||||
|
||||
#define container_of(ptr, type, member) ({ \
|
||||
diff --git a/src/wayland-util.c b/src/wayland-util.c
|
||||
index 639ccf8..077fec7 100644
|
||||
--- a/src/wayland-util.c
|
||||
+++ b/src/wayland-util.c
|
||||
@@ -102,6 +102,7 @@ WL_EXPORT void
|
||||
wl_array_release(struct wl_array *array)
|
||||
{
|
||||
free(array->data);
|
||||
+ array->data = WL_ARRAY_POISON_PTR;
|
||||
}
|
||||
|
||||
WL_EXPORT void *
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 21 22:33:07 UTC 2017 - jengelh@inai.de
|
||||
|
||||
- Update to new upstrea mrelease 1.13.0
|
||||
* Add some API for controlling the visibility of globals.
|
||||
- Drop wayland-wl_array_Set_data_to_invalid_address_after_free.patch
|
||||
(no longer needed)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 5 21:51:01 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
%define lname libwayland0
|
||||
Name: wayland
|
||||
Version: 1.12.0
|
||||
Version: 1.13.0
|
||||
Release: 0
|
||||
Summary: Wayland Compositor Infrastructure
|
||||
License: MIT
|
||||
@ -31,8 +31,6 @@ Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz
|
||||
Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig
|
||||
Source3: %name.keyring
|
||||
Source4: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM wayland-wl_array_Set_data_to_invalid_address_after_free.patch zaitor@opensuse.org -- Fix a crash after free.
|
||||
Patch0: wayland-wl_array_Set_data_to_invalid_address_after_free.patch
|
||||
#git#BuildRequires: autoconf >= 2.64
|
||||
#git#BuildRequires: automake >= 1.11
|
||||
#git#BuildRequires: libtool >= 2.2
|
||||
@ -122,12 +120,11 @@ This subpackage contains the documentation to Wayland.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
if [ ! -e configure ]; then
|
||||
autoreconf -fi;
|
||||
fi;
|
||||
autoreconf -fi
|
||||
fi
|
||||
%configure --disable-static --includedir="%_includedir/%name" \
|
||||
%if %with_doc
|
||||
--docdir="%_defaultdocdir/%name"
|
||||
|
Loading…
Reference in New Issue
Block a user