Attachment 16094 Details for Bug 15622 – fix mplayer crash

[patch] fix mplayer crash

mplayer-crash-fix.patch (text/plain), 1.23 KB, created by Hong Liu on 2008-04-21 23:36:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hong Liu

Created: 2008-04-21 23:36:53 UTC

Size: 1.23 KB

patch

obsolete

>diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
>index 38d605c..f0970d0 100644
>--- a/hw/xfree86/common/xf86VidMode.c
>+++ b/hw/xfree86/common/xf86VidMode.c
>@@ -150,10 +150,12 @@ 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
>diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
>index 8c2b247..e3a9066 100644
>--- a/hw/xfree86/modes/xf86Crtc.c
>+++ b/hw/xfree86/modes/xf86Crtc.c
>@@ -1554,13 +1554,13 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
>     DisplayModePtr	last, mode;
> 
>     output = config->output[config->compat_output];
>-    if (!output->crtc)
>+    if (!output->crtc || !output->probed_modes)
>     {
> 	int o;
> 
> 	output = NULL;
> 	for (o = 0; o < config->num_output; o++)
>-	    if (config->output[o]->crtc)
>+	    if (config->output[o]->crtc || config->output[o]->probed_modes)
> 	    {
> 		config->compat_output = o;
> 		output = config->output[o];

Actions: View | Splinter Review

Attachments on bug 15622: 16062 | 16063 | 16064 | 16065 | 16066 | 16067 | 16068 | 16087 | 16094 | 16095

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.