[Mesa-stable] [PATCH 2/2] r300/compiler/tests: Fix line length check in test parser
Tom Stellard
tom at stellard.net
Mon Dec 2 18:46:04 PST 2013
From: Tom Stellard <thomas.stellard at amd.com>
CC: "9.2" "10.0" <mesa-stable at lists.freedesktop.org>
---
src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c b/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c
index af7b3ce..b4e30d8 100644
--- a/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c
+++ b/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c
@@ -542,6 +542,7 @@ unsigned load_program(
char **string_store;
unsigned i = 0;
+ memset(line, 0, sizeof(line));
snprintf(path, MAX_PATH_LENGTH, "compiler/tests/%s", filename);
file = fopen(path, "r");
if (!file) {
@@ -552,7 +553,8 @@ unsigned load_program(
count = &test->num_input_lines;
while (fgets(line, MAX_LINE_LENGTH, file)){
- if (line[MAX_LINE_LENGTH - 2] == '\n') {
+ char last_char = line[MAX_LINE_LENGTH - 1];
+ if (last_char && last_char != '\n') {
fprintf(stderr, "Error line cannot be longer than 100 "
"characters:\n%s\n", line);
return 0;
--
1.8.1.5
More information about the mesa-stable
mailing list