Commit c7011249 authored by Keith Packard's avatar Keith Packard

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's avatarKeith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp's avatarJamey Sharp <jamey@minilop.net>
parent 0af87885
......@@ -1204,7 +1204,8 @@ XkmReadTOC(FILE * file, xkmFileInfo * file_info, int max_toc,
}
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;
if (size_toc > max_toc) {
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;
}
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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment