debian/changelog | 6 ++ debian/patches/117_fix_crash_with_createglyphset.patch | 41 ----------------- debian/patches/series | 1 3 files changed, 6 insertions(+), 42 deletions(-)
New commits: commit 295fa834b4f1215a0909b2cc2fe6fe3aae318eb4 Author: Bryce Harrington <[email protected]> Date: Fri Apr 16 09:35:07 2010 -0700 Drop duplicate patch diff --git a/debian/changelog b/debian/changelog index 251c6be..5d81c29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.7.6-2ubuntu7) UNRELEASED; urgency=low + + * Drop 117_fix_crash_with_createglyphset.patch - dupe of patch 110 + + -- Bryce Harrington <[email protected]> Fri, 16 Apr 2010 09:34:39 -0700 + xorg-server (2:1.7.6-2ubuntu6) lucid; urgency=low * Add 122_xext_fix_card32_overflow_in_xauth.patch: Prevent overflow diff --git a/debian/patches/117_fix_crash_with_createglyphset.patch b/debian/patches/117_fix_crash_with_createglyphset.patch deleted file mode 100644 index 9457b97..0000000 --- a/debian/patches/117_fix_crash_with_createglyphset.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 185185eeb44a277c324be0f58a4b4a469b56b69b Mon Sep 17 00:00:00 2001 -From: Peter Harris <[email protected]> -Date: Tue, 23 Mar 2010 16:08:19 +0000 -Subject: Fix crash when all glyphs of a given depth are freed, but not all glyphsets - -This is how the crash can be triggered with only two clients on the system: -Client A: (already running) -Client B: Connect -Client B: CreateGlyphSet(depthN) -Client A: Disconnect -Server: free globalGlyphs(depthN) -Client B: AddGlyphs(depthN) -Server: SEGV - -This crash was introduced with the FindGlyphsByHash function -in 516b96387b0e57b524a37a96da22dbeeeb041712. Before that revision, -ResizeGlyphSet was always called before FindGlyphRef, which would -re-create globalGlyphs(depthN) if necessary. - -X.Org Bug 20718 <http://bugs.freedesktop.org/show_bug.cgi?id=20718> - -Reviewed-by: Adam Jackson <[email protected]> -Signed-off-by: Peter Harris <[email protected]> -Signed-off-by: Keith Packard <[email protected]> ---- -diff --git a/render/glyph.c b/render/glyph.c -index 0b864ad..f0f3b19 100644 ---- a/render/glyph.c -+++ b/render/glyph.c -@@ -217,6 +217,9 @@ FindGlyphByHash (unsigned char sha1[20], int format) - GlyphRefPtr gr; - CARD32 signature = *(CARD32 *) sha1; - -+ if (!globalGlyphs[format].hashSet) -+ return NULL; -+ - gr = FindGlyphRef (&globalGlyphs[format], - signature, TRUE, sha1); - --- -cgit v0.8.3-6-g21f6 diff --git a/debian/patches/series b/debian/patches/series index eb9e37c..d5ceb48 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -29,7 +29,6 @@ 114_dri2_make_sure_x_drawable_exists.patch 115_xext_fix_cursor_ref_counting.patch 116_fix_typos_in_swap_functions.patch -117_fix_crash_with_createglyphset.patch 118_xkb_fix_garbage_init.patch 121_only_switch_vt_when_active.diff 122_xext_fix_card32_overflow_in_xauth.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
