frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Size xf86DefaultModes explicitly. 

i.e., don't check for the end of the list by ->name == NULL, since that
won't work now.  Fix the consumers of xf86DefaultModes to use the new
explicit size as well.
This commit is contained in:
Adam Jackson 2008-03-07 09:25:06 -05:00
parent 3fcb6445dc
commit 3bf7ff7032
4 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/modeline2c.awk
View File

@ -91,5 +91,6 @@ BEGIN {
} }
END { END {
printf("\t{MODEPREFIX,0,0,0,0,0,0,0,0,0,0,0,0,MODESUFFIX}\n};\n") print "};"
printf "const int xf86NumDefaultModes = sizeof(xf86NumDefaultModes) / sizeof(DisplayModeRec);"
} }

30
hw/xfree86/common/xf86Config.c
View File

@ -2420,28 +2420,16 @@ addDefaultModes(MonPtr monitorp)
DisplayModePtr last = monitorp->Last; DisplayModePtr last = monitorp->Last;
int i = 0; int i = 0;
while (xf86DefaultModes[i].name != NULL) for (i = 0; i < xf86NumDefaultModes; i++)
{ {
if ( ! modeIsPresent(xf86DefaultModes[i].name,monitorp) ) mode = xf86DuplicateMode(&xf86DefaultModes[i]);
do if (!modeIsPresent(mode, monitorp))
{ {
mode = xf86DuplicateMode(&xf86DefaultModes[i]); monitorp->Modes = xf86ModesAdd(monitorp->Modes, mode);
if( last ) { last = mode;
mode->prev = last; } else {
last->next = mode; xfree(mode);
} }
else {
/* this is the first mode */
monitorp->Modes = mode;
mode->prev = NULL;
}
last = mode;
i++;
}
while((xf86DefaultModes[i].name != NULL) &&
(!strcmp(xf86DefaultModes[i].name,xf86DefaultModes[i-1].name)));
else
i++;
} }
monitorp->Last = last; monitorp->Last = last;

1
hw/xfree86/common/xf86Priv.h
View File

@ -154,6 +154,7 @@ Bool xf86PathIsSafe(const char *path);
/* xf86DefaultModes */ /* xf86DefaultModes */
extern const DisplayModeRec xf86DefaultModes[]; extern const DisplayModeRec xf86DefaultModes[];
extern const int xf86NumDefaultModes;
/* xf86DoProbe.c */ /* xf86DoProbe.c */
void DoProbe(void); void DoProbe(void);

28
hw/xfree86/modes/xf86Modes.c
View File

@ -214,11 +214,7 @@ xf86DuplicateMode(DisplayModePtr pMode)
*pNew = *pMode; *pNew = *pMode;
pNew->next = NULL; pNew->next = NULL;
pNew->prev = NULL; pNew->prev = NULL;
/*
* It is important to copy the name explicitly.
* Otherwise a mode could reference an invalid piece of memory, after one of them runs free().
* This will lead to obscure problems, that you really don't want.
*/
if (pMode->name == NULL) if (pMode->name == NULL)
xf86SetModeDefaultName(pNew); xf86SetModeDefaultName(pNew);
else else
@ -667,7 +663,7 @@ xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed)
DisplayModePtr head = NULL, prev = NULL, mode; DisplayModePtr head = NULL, prev = NULL, mode;
int i; int i;
for (i = 0; xf86DefaultModes[i].name != NULL; i++) for (i = 0; i < xf86NumDefaultModes; i++)
{ {
DisplayModePtr defMode = &xf86DefaultModes[i]; DisplayModePtr defMode = &xf86DefaultModes[i];
@ -676,23 +672,9 @@ xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed)
if (!doubleScanAllowed && (defMode->Flags & V_DBLSCAN)) if (!doubleScanAllowed && (defMode->Flags & V_DBLSCAN))
continue; continue;
mode = xalloc(sizeof(DisplayModeRec)); mode = xf86DuplicateMode(defMode);
if (!mode)
continue; head = xf86ModesAdd(head, mode);
memcpy(mode,&xf86DefaultModes[i],sizeof(DisplayModeRec));
mode->name = xstrdup(xf86DefaultModes[i].name);
if (!mode->name)
{
xfree (mode);
continue;
}
mode->prev = prev;
mode->next = NULL;
if (prev)
prev->next = mode;
else
head = mode;
prev = mode;
} }
return head; return head;
} }