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

xkb: Verify reads of compiled keymap header and TOC 

Check the return values from fread to make sure the elements are
actually getting read from the file.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Keith Packard 2014-04-18 15:12:14 -07:00
parent 0af8788579
commit c7011249d2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xkb/xkmread.c
View File

@ -1204,7 +1204,8 @@ XkmReadTOC(FILE * file, xkmFileInfo * file_info, int max_toc,
} }
return 0; return 0;
} }
fread(file_info, SIZEOF(xkmFileInfo), 1, file); if (fread(file_info, SIZEOF(xkmFileInfo), 1, file) != 1)
return 0;
size_toc = file_info->num_toc; size_toc = file_info->num_toc;
if (size_toc > max_toc) { if (size_toc > max_toc) {
DebugF("Warning! Too many TOC entries; last %d ignored\n", DebugF("Warning! Too many TOC entries; last %d ignored\n",
@ -1212,7 +1213,8 @@ XkmReadTOC(FILE * file, xkmFileInfo * file_info, int max_toc,
size_toc = max_toc; size_toc = max_toc;
} }
for (i = 0; i < size_toc; i++) { for (i = 0; i < size_toc; i++) {
fread(&toc[i], SIZEOF(xkmSectionInfo), 1, file); if (fread(&toc[i], SIZEOF(xkmSectionInfo), 1, file) != 1)
return 0;
} }
return 1; return 1;
} }