summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2009-11-06 17:36:47 -0800
committerVinson Lee <vlee@vmware.com>2009-11-06 17:36:47 -0800
commit2476b9405ffa450ad4e9d6bc4de15cd1213928e1 (patch)
treeed9f0e6535accdc1286ba9909b2cc4f8b4a43756
parentb9ff3044bc68cb322ce61bc0f9245b4f13d8bcf6 (diff)
shader-load: Fix null dereference when there is an error.
text is NULL when there is an error with FILE object fp.
-rw-r--r--tests/util/shader-load.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/util/shader-load.c b/tests/util/shader-load.c
index e4004c2f5..c26f98ad9 100644
--- a/tests/util/shader-load.c
+++ b/tests/util/shader-load.c
@@ -87,7 +87,10 @@ char *piglit_load_text_file(const char *file_name, unsigned *size)
}
} while (total_read < len);
- text[total_read] = '\0';
+ if (text != NULL) {
+ text[total_read] = '\0';
+ }
+
if (size != NULL) {
*size = total_read;
}