diff options
| author | Matthias Hopf <mhopf@suse.de> | 2007-04-13 16:16:05 +0200 |
|---|---|---|
| committer | Matthias Hopf <mhopf@suse.de> | 2007-04-13 16:16:05 +0200 |
| commit | aea801cf9a5ce519a53d6fffd9a3a2e526ec79ea (patch) | |
| tree | 21f5ccd62221b9c9121481f2fc2a427508bc009a | |
| parent | 07ddffb32e6293c77b32c94b87ec468caef3d6f5 (diff) | |
Fix crash if MergedFB and secondary head not found
If the secondary head isn't found (Monitor unplugged etc.) but MergedFB
is configured, the driver segfaults because it tries to access the mode
list private structures, which are not filled in.
| -rw-r--r-- | src/radeon_driver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index c4bda8a3..0f9e2d61 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2328,7 +2328,11 @@ static Bool RADEONPreInitModes(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) } } + else + info->MergedFB = FALSE; } + else + info->MergedFB = FALSE; if (info->MergedFB) { /* If no virtual dimension was given by the user, |