diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-05-29 23:46:01 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-05-29 23:46:01 +0000 |
| commit | f355f44773e2220bf85b3b4b735c393081b86043 (patch) | |
| tree | aa8f6e25b65f45b91ed07fbe90e391c5dc2eba2d /x11-base/xorg-server/files | |
| parent | keyword ~amd64-fbsd (diff) | |
| download | gentoo-2-f355f44773e2220bf85b3b4b735c393081b86043.tar.gz gentoo-2-f355f44773e2220bf85b3b4b735c393081b86043.tar.bz2 gentoo-2-f355f44773e2220bf85b3b4b735c393081b86043.zip | |
Version bump. Add patch for bug #402285.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'x11-base/xorg-server/files')
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch b/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch new file mode 100644 index 000000000000..8fedc32cc3b5 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch @@ -0,0 +1,35 @@ +Patch by Torsten Kaiser <x11@ariolc.dyndns.org> +taken from https://bugs.freedesktop.org/show_bug.cgi?id=45623 + +diff -ur a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c +--- a/hw/xfree86/modes/xf86EdidModes.c 2012-05-17 19:09:03.000000000 +0200 ++++ b/hw/xfree86/modes/xf86EdidModes.c 2012-05-30 01:27:06.000000000 +0200 +@@ -723,7 +723,13 @@ + 1920, 1200, 75, 0}, { + 1920, 1200, 85, 0}, { + 1920, 1440, 60, 0}, { +-1920, 1440, 75, 0},}; ++1920, 1440, 75, 0}, ++ /* fill up last byte */ ++ { 0,0,0,0 }, ++ { 0,0,0,0 }, ++ { 0,0,0,0 }, ++ { 0,0,0,0 }, ++}; + + static DisplayModePtr + DDCModesFromEstIII(unsigned char *est) +@@ -732,10 +738,11 @@ + int i, j, m; + + for (i = 0; i < 6; i++) { +- for (j = 7; j > 0; j--) { ++ for (j = 7; j >= 0; j--) { + if (est[i] & (1 << j)) { + m = (i * 8) + (7 - j); +- modes = xf86ModesAdd(modes, ++ if (EstIIIModes[m].w) ++ modes = xf86ModesAdd(modes, + FindDMTMode(EstIIIModes[m].w, + EstIIIModes[m].h, + EstIIIModes[m].r, |