debian/changelog | 10 +++
debian/patches/123_exa_sys_ptr_nullpointer_check.patch | 44 +++++++++++++++++
debian/patches/series | 1
3 files changed, 55 insertions(+)
New commits:
commit 5486fd376e36c1a5819e6671a58c1fcbc075a5d2
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Wed Apr 28 12:24:58 2010 -0700
Incorporate fix for crash in miCopyRegion.
diff --git a/debian/changelog b/debian/changelog
index e1bc276..88f1b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.7.6-2ubuntu8) lucid; urgency=low
+
+ * Add 123_exa_sys_ptr_nullpointer_check.patch: Patch from upstream to
+ verify a pointer is not NULL before dereferencing it. Fixes X
+ segfault in miCopyRegion which occurs while using firefox (e.g. typing
+ into fields in AOL). Issue found by Jerry Lamos.
+ (LP: #539772)
+
+ -- Bryce Harrington <br...@ubuntu.com> Wed, 28 Apr 2010 12:20:10 -0700
+
xorg-server (2:1.7.6-2ubuntu7) lucid; urgency=low
* Drop 117_fix_crash_with_createglyphset.patch
diff --git a/debian/patches/123_exa_sys_ptr_nullpointer_check.patch
b/debian/patches/123_exa_sys_ptr_nullpointer_check.patch
new file mode 100644
index 0000000..44ca87b
--- /dev/null
+++ b/debian/patches/123_exa_sys_ptr_nullpointer_check.patch
@@ -0,0 +1,44 @@
+From a153cc3d244ec187b2152b1c1737fcc3038675fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daen...@vmware.com>
+Date: Wed, 21 Apr 2010 10:46:16 +0200
+Subject: [PATCH] EXA: Check sys_ptr isn't NULL before passing it to the
UploadToScreen hook.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27510 .
+
+Signed-off-by: Michel Dänzer <daen...@vmware.com>
+Reviewed-by: Alex Deucher <alexdeuc...@gmail.com>
+Signed-off-by: Keith Packard <kei...@keithp.com>
+(cherry picked from commit 7b6517526631a65891b806bca30be8f49955d0a8)
+---
+ exa/exa_accel.c | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/exa/exa_accel.c b/exa/exa_accel.c
+index 7e2dd70..c20c9ac 100644
+--- a/exa/exa_accel.c
++++ b/exa/exa_accel.c
+@@ -504,7 +504,7 @@ exaHWCopyNtoN (DrawablePtr pSrcDrawable,
+ (*pExaScr->info->DoneCopy) (pDstPixmap);
+ exaMarkSync (pDstDrawable->pScreen);
+ /* UTS: mainly for SHM PutImage's secondary path. */
+- } else {
++ } else if (pSrcExaPixmap->sys_ptr) {
+ int bpp = pSrcDrawable->bitsPerPixel;
+ int src_stride = exaGetPixmapPitch(pSrcPixmap);
+ CARD8 *src = NULL;
+@@ -531,7 +531,8 @@ exaHWCopyNtoN (DrawablePtr pSrcDrawable,
+
+ pbox++;
+ }
+- }
++ } else
++ goto fallback;
+ } else
+ goto fallback;
+
+--
+1.7.0.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2263d50..5f6dfcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,3 +49,4 @@
198_nohwaccess.patch
199_xfvb-help-typo.patch
200_randr-null.patch
+123_exa_sys_ptr_nullpointer_check.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o7czs-00072k...@alioth.debian.org
