From c7011249d2abe6cc7af82ee4b79d8f6873444707 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 18 Apr 2014 15:12:14 -0700 Subject: 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 Reviewed-by: Jamey Sharp --- xkb/xkmread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xkb/xkmread.c b/xkb/xkmread.c index 258bb91b5..b6241b5c7 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -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; } -- cgit v1.2.3