diff options
| author | Matt Turner <mattst88@gmail.com> | 2015-03-03 16:02:40 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-07 16:37:15 +0000 |
| commit | 8e8d215cae22238125e99166115400ce281d72e9 (patch) | |
| tree | c3f05c2c6e42e5310e0d3eecbd39de2682c69ef2 | |
| parent | 1a929baa0b27373265a4a7d9f04d9925b7b6ac17 (diff) | |
r300g: Use PATH_MAX instead of limiting ourselves to 100 chars.
When built with Gentoo's package manager, the Mesa source directory
exists seven directories deep. The path to the .test file is too long
and is silently truncated, leading to a crash. Just use PATH_MAX.
Cc: 10.4, 10.5 <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=540970
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
(cherry picked from commit f5e2aa1324dd6a9666bb21834097d2fbc3cb99b6)
| -rw-r--r-- | src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 7c9d1779df5..422bdb04405 100644 --- a/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c +++ b/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c @@ -28,6 +28,7 @@ */ #include <errno.h> +#include <limits.h> #include <regex.h> #include <stdlib.h> #include <stdio.h> @@ -528,7 +529,6 @@ void init_compiler( } #define MAX_LINE_LENGTH 100 -#define MAX_PATH_LENGTH 100 unsigned load_program( struct radeon_compiler *c, @@ -536,14 +536,14 @@ unsigned load_program( const char *filename) { char line[MAX_LINE_LENGTH]; - char path[MAX_PATH_LENGTH]; + char path[PATH_MAX]; FILE *file; unsigned *count; char **string_store; unsigned i = 0; memset(line, 0, sizeof(line)); - snprintf(path, MAX_PATH_LENGTH, TEST_PATH "/%s", filename); + snprintf(path, PATH_MAX, TEST_PATH "/%s", filename); file = fopen(path, "r"); if (!file) { return 0; |