diff options
author | Zack Rusin <zackr@vmware.com> | 2009-12-07 18:13:57 -0500 |
---|---|---|
committer | Zack Rusin <zackr@vmware.com> | 2009-12-07 18:13:57 -0500 |
commit | 45412c2343a3ed1de388aca6a5ae25c49918c9bc (patch) | |
tree | 44303c67e10949cad86ed1bf1fe818c397288e7b /progs/slang/vstest.c | |
parent | 9b5f260756356a73984d60c907c525b8a2f8cf94 (diff) | |
parent | cad14c2542698de144bb5434cefa02d7a00aaa74 (diff) | |
download | mesa-45412c2343a3ed1de388aca6a5ae25c49918c9bc.tar.gz |
Merge remote branch 'origin/master' into arb_geometry_shader4arb_geometry_shader4
Conflicts:
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/enums.c
src/mesa/main/remap_helper.h
src/mesa/state_tracker/st_atom_shader.c
src/mesa/state_tracker/st_program.c
src/mesa/state_tracker/st_program.h
Diffstat (limited to 'progs/slang/vstest.c')
-rw-r--r-- | progs/slang/vstest.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/progs/slang/vstest.c b/progs/slang/vstest.c index 472ea9b62e2..33c6f09dc55 100644 --- a/progs/slang/vstest.c +++ b/progs/slang/vstest.c @@ -220,6 +220,12 @@ static void load_test_file (const char *filename) fseek (f, 0, SEEK_END); size = ftell (f); + + if (size == -1) { + fclose (f); + return; + } + fseek (f, 0, SEEK_SET); code = (char *) (malloc (size)); |