diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-11-06 07:41:29 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-11-06 07:41:29 +0000 |
| commit | 67bdaae04ab37f38a6d0c8dc4b6328c3ba3b3393 (patch) | |
| tree | b4e3b7d1acd780c9149e653fb807dc3c00472ad3 /src | |
| parent | 733ebf6e4a7c7b2f1a861077d43da2a853e4c0d7 (diff) | |
Sun bug #6325220: Xorg dumps core in dual monitor configuration with radeon
driver if CRT2Position not specified in xorg.conf
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6325220>
(Stuart Krietman - Sun Microsystems)
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_driver.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 8dc3271e..0d7fa7ed 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -8880,8 +8880,15 @@ RADEONGetMergedFBOptions(ScrnInfoPtr pScrn) Bool valid = FALSE; char *tempstr; strptr = (char *)xf86GetOptValString(info->Options, OPTION_CRT2POS); - tempstr = xalloc(strlen(strptr) + 1); - result = sscanf(strptr, "%s %d", tempstr, &ival); + if (strptr) { + tempstr = xalloc(strlen(strptr) + 1); + result = sscanf(strptr, "%s %d", tempstr, &ival); + } else { /* Not specified - default is "Clone" */ + tempstr = NULL; + result = 0; + info->CRT2Position = radeonClone; + valid = TRUE; + } if(result >= 1) { if(!xf86NameCmp(tempstr,"LeftOf")) { info->CRT2Position = radeonLeftOf; |