From 6dd27bc4a3e4c5fb2d9349c04489b3324519e91b Mon Sep 17 00:00:00 2001 From: Nicholas Vinson Date: Sat, 17 May 2025 11:30:23 -0400 Subject: [PATCH] test_utils/test_main.c: increase logfilename bf sz Increase logfilename buffer size from 64 to 256. This aligns the buffer size with the size limits found in Windows and Linux. --- test_utils/test_main.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/test_utils/test_main.c b/test_utils/test_main.c index 80d969caf..f4456256c 100644 --- a/test_utils/test_main.c +++ b/test_utils/test_main.c @@ -3565,9 +3565,10 @@ test_run(int i, const char *tmpdir) #else char workdir[1024 * 2]; #endif - char logfilename[64]; + char logfilename[256]; int failures_before = failures; int skips_before = skips; + int tmp; mode_t oldumask; switch (verbosity) { @@ -3588,11 +3589,38 @@ test_run(int i, const char *tmpdir) exit(1); } /* Create a log file for this test. */ - snprintf(logfilename, sizeof(logfilename), "%s.log", tests[i].name); + tmp = snprintf(logfilename, sizeof(logfilename), "%s.log", tests[i].name); + if (tmp < 0) { + fprintf(stderr, + "ERROR can't create %s.log: %s\n", + tests[i].name, strerror(errno)); + exit(1); + } + if ((size_t)tmp >= sizeof(logfilename)) { + fprintf(stderr, + "ERROR can't create %s.log: Name too long. " + "Length %d; Max allowed length %zu\n", + tests[i].name, tmp, sizeof(logfilename) - 1); + exit(1); + } logfile = fopen(logfilename, "w"); fprintf(logfile, "%s\n\n", tests[i].name); /* Chdir() to a work dir for this specific test. */ - snprintf(workdir, sizeof(workdir), "%s/%s", tmpdir, tests[i].name); + tmp = snprintf(workdir, + sizeof(workdir), "%s/%s", tmpdir, tests[i].name); + if (tmp < 0) { + fprintf(stderr, + "ERROR can't create %s/%s: %s\n", + tmpdir, tests[i].name, strerror(errno)); + exit(1); + } + if ((size_t)tmp >= sizeof(workdir)) { + fprintf(stderr, + "ERROR can't create %s/%s: Path too long. " + "Length %d; Max allowed length %zu\n", + tmpdir, tests[i].name, tmp, sizeof(workdir) - 1); + exit(1); + } testworkdir = workdir; if (!assertMakeDir(testworkdir, 0755) || !assertChdir(testworkdir)) { -- 2.39.5