xserver: Branch 'server-1.5-branch'
Adam Jackson
ajax at kemper.freedesktop.org
Fri Mar 7 05:31:43 PST 2008
hw/xfree86/modes/xf86Crtc.c | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit b260febcec2e483c094d5c31ed9910a36a65cc53
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Mar 7 08:29:49 2008 -0500
Fix segfault when a monitor exists but has no modes.
Thanks to Zhenyu Wang for finding this.
(cherry picked from commit 3fcb6445dc08f42488287162e3b7009d405e9c5b)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 4d5d7b8..0bef5b4 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1678,6 +1678,9 @@ nextAspectMode(DisplayModePtr start, float aspect)
{
DisplayModePtr m = start;
+ if (!m)
+ return NULL;
+
for (m = m->next; m; m = m->next)
if (aspectMatch(aspect, (float)m->HDisplay / (float)m->VDisplay))
return m;
More information about the xorg-commit
mailing list