andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: check for NULL pointer before dereferences it in parser code

Browse Source 
Seems to be harmless. Meh.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
This commit is contained in:
Tiago Vignatti 2010-04-19 20:18:51 +03:00
parent d948dcd955
commit 7f457351d2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/parser/scan.c
View File

@ -845,10 +845,13 @@ static int
ConfigFilter(const struct dirent *de) ConfigFilter(const struct dirent *de)
{ {
const char *name = de->d_name; const char *name = de->d_name;
size_t len = strlen(name); size_t len;
size_t suflen = strlen(XCONFIGSUFFIX); size_t suflen = strlen(XCONFIGSUFFIX);
if (!name || name[0] == '.' || len <= suflen) if (!name || name[0] == '.')
return 0;
len = strlen(name);
if(len <= suflen)
return 0; return 0;
if (strcmp(&name[len-suflen], XCONFIGSUFFIX) != 0) if (strcmp(&name[len-suflen], XCONFIGSUFFIX) != 0)
return 0; return 0;