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

Coverity #488: Avoid smashing an array on malformed config files.

This commit is contained in:
Adam Jackson 2006-04-07 01:53:43 +00:00
parent 20c1ef2cc3
commit 75a9afdbf4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-04-06 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/parser/Monitor.c:
Coverity #488: Avoid smashing an array on malformed config
files.
2006-04-06 Adam Jackson <ajax@freedesktop.org> 2006-04-06 Adam Jackson <ajax@freedesktop.org>
* hw/dmx/glxProxy/glxsingle.c: * hw/dmx/glxProxy/glxsingle.c:

4
hw/xfree86/parser/Monitor.c
View File

@ -460,6 +460,8 @@ xf86parseMonitorSection (void)
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (HORIZSYNC_MSG, NULL); Error (HORIZSYNC_MSG, NULL);
do { do {
if (ptr->mon_n_hsync >= CONF_MAX_HSYNC)
Error ("Sorry. Too many horizontal sync intervals.", NULL);
ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum; ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum;
switch (token = xf86getSubToken (&(ptr->mon_comment))) switch (token = xf86getSubToken (&(ptr->mon_comment)))
{ {
@ -485,8 +487,6 @@ xf86parseMonitorSection (void)
ptr->mon_n_hsync++; ptr->mon_n_hsync++;
goto HorizDone; goto HorizDone;
} }
if (ptr->mon_n_hsync >= CONF_MAX_HSYNC)
Error ("Sorry. Too many horizontal sync intervals.", NULL);
ptr->mon_n_hsync++; ptr->mon_n_hsync++;
} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER); } while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);
HorizDone: HorizDone: