xorg-server: Changes to 'debian-unstable'
debian/changelog | 2 ++
hw/xfree86/common/xf86VidMode.c | 10 +++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 13f68e9414dba88af77fd96cdd3507a09a394cf8
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 9 18:31:52 2008 +0100
Update changelog for cherry-pick
diff --git a/debian/changelog b/debian/changelog
index 22c67ab..f66ad47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg-server (2:1.4.2-6) UNRELEASED; urgency=low
Natvig!
* Xevie: swap replies if necessary, to not confuse clients with a different
endianness.
+ * Cherry-picked from upstream git:
+ XF86VidMode: Correct a NULL pointer deference (closes: #498289)
-- Julien Cristau <jcristau@debian.org> Mon, 01 Sep 2008 19:21:18 +0200
commit 3f1d43e35cdb29b2fbd39c30ee31c12280cb51ec
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri May 23 13:50:39 2008 -0300
Correct a NULL pointer deference
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit c8af7ce35a900ac9b898f51c1b95dabad3ba1d76)
diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
index 16a4d82..64e6a37 100644
--- a/hw/xfree86/common/xf86VidMode.c
+++ b/hw/xfree86/common/xf86VidMode.c
@@ -157,10 +157,14 @@ VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock)
return FALSE;
pScrn = xf86Screens[scrnIndex];
- *mode = (pointer)(pScrn->currentMode);
- *dotClock = pScrn->currentMode->Clock;
- return TRUE;
+ if (pScrn->currentMode) {
+ *mode = (pointer)(pScrn->currentMode);
+ *dotClock = pScrn->currentMode->Clock;
+
+ return TRUE;
+ }
+ return FALSE;
}
_X_EXPORT int
Reply to: