[xorg-x11-drv-intel/f15] intel-2.15-stable.patch: Update for uxa crash for long glyph strings, from 18d08e49
Adam Jackson
ajax at fedoraproject.org
Fri Jul 15 15:03:10 UTC 2011
commit d41d1cdd997bcf5193793ea8a7f5ec7091b98031
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Jul 15 11:02:41 2011 -0400
intel-2.15-stable.patch: Update for uxa crash for long glyph strings,
from 18d08e49
intel-2.15-stable.patch | 28 ++++++++++++++++++++++++++++
xorg-x11-drv-intel.spec | 6 +++++-
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/intel-2.15-stable.patch b/intel-2.15-stable.patch
index 1161c00..ca12893 100644
--- a/intel-2.15-stable.patch
+++ b/intel-2.15-stable.patch
@@ -598,3 +598,31 @@ index 0650ac2..516834f 100644
ret = TRUE;
err:
+diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
+index 0f5ddda..7b2edea 100644
+--- a/uxa/uxa-glyphs.c
++++ b/uxa/uxa-glyphs.c
+@@ -937,6 +937,11 @@ uxa_glyphs_via_mask(CARD8 op,
+ if (!pixmap)
+ return 1;
+
++ if (!uxa_pixmap_is_offscreen(pixmap)) {
++ screen->DestroyPixmap(pixmap);
++ return -1;
++ }
++
+ uxa_clear_pixmap(screen, uxa_screen, pixmap);
+
+ component_alpha = NeedsComponent(maskFormat->format);
+@@ -1129,6 +1134,11 @@ fallback:
+ if (!pixmap)
+ return;
+
++ if (!uxa_pixmap_is_offscreen(pixmap)) {
++ screen->DestroyPixmap(pixmap);
++ goto fallback;
++ }
++
+ gc = GetScratchGC(depth, screen);
+ if (!gc) {
+ screen->DestroyPixmap(pixmap);
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 6799e08..ac0eb5d 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -6,7 +6,7 @@
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.15.0
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -125,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/intel_*.1*
%changelog
+* Fri Jul 15 2011 Adam Jackson <ajax at redhat.com> 2.15.0-5
+- intel-2.15-stable.patch: Update for uxa crash for long glyph strings,
+ from 18d08e49
+
* Tue Jul 05 2011 Adam Jackson <ajax at redhat.com> 2.15.0-4
- intel-2.15-stable.patch: Non-SNA-related bugfixes from master (#717331,
#716494)
More information about the scm-commits
mailing list