summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-03-12 16:58:26 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2014-03-14 13:00:01 +0000
commitad4a44ebfc9f72d34bf3523e455822896a788507 (patch)
treebf5be5392f93a6f75a291043967f97371f4e4d63 /src/gallium
parentae7d2361721926dc16a4c71034536f6b8676e1be (diff)
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 <imirkin@alum.mit.edu> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nouveau/nouveau_compiler.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_compiler.c b/src/gallium/drivers/nouveau/nouveau_compiler.c
index 5f1e35a0d24..ac22035ca82 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);