Module: Mesa Branch: master Commit: ad4a44ebfc9f72d34bf3523e455822896a788507 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad4a44ebfc9f72d34bf3523e455822896a788507
Author: Emil Velikov <[email protected]> Date: Wed Mar 12 16:58:26 2014 +0000 nouveau: honor fread return value in the nouveau_compiler There is little point of continuing if fread returns zero, as it indicates that either the file is empty or cannot be read from. Bail out if fread returns zero after closing the file. Cc: Ilia Mirkin <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]> --- src/gallium/drivers/nouveau/nouveau_compiler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_compiler.c b/src/gallium/drivers/nouveau/nouveau_compiler.c index 5f1e35a..ac22035 100644 --- a/src/gallium/drivers/nouveau/nouveau_compiler.c +++ b/src/gallium/drivers/nouveau/nouveau_compiler.c @@ -173,9 +173,9 @@ main(int argc, char *argv[]) return 1; } - fread(text, 1, sizeof(text), f); - if (ferror(f)) { + if (!fread(text, 1, sizeof(text), f) || ferror(f)) { _debug_printf("Error reading file '%s'\n", filename); + fclose(f); return 1; } fclose(f); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
