Commit d5b04ab19cf2273becb0b95274964c02f8b26c66
2020-08-16T22:01:42
test: Fix short lived memory leaks These are non-issues, but having a clean ASAN test suite makes it possible to detect actual problems in the tested code. Warned-by: gcc ASAN
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/test/fgetln.c b/test/fgetln.c
index 7d1e9dc..5e04281 100644
--- a/test/fgetln.c
+++ b/test/fgetln.c
@@ -61,6 +61,7 @@ static const wchar_t *data_wide[] = {
struct file {
FILE *fp;
+ void *line_alloc;
const void **lines;
const void *got_buf;
@@ -97,6 +98,7 @@ test_fgetln_multi(void)
str = strdup("A\n");
str[0] += i;
+ files[i].line_alloc = str;
files[i].lines = reallocarray(NULL, LINE_COUNT, sizeof(char *));
files[i].lines[0] = str;
files[i].lines[1] = str;
@@ -123,8 +125,11 @@ test_fgetln_multi(void)
}
}
- for (i = 0; i < LINE_COUNT; i++)
+ for (i = 0; i < FILE_COUNT; i++) {
+ free(files[i].line_alloc);
+ free(files[i].lines);
pipe_close(files[i].fp);
+ }
}
static void
@@ -159,6 +164,7 @@ test_fgetwln_multi(void)
wstr = wcsdup(L"A\n");
wstr[0] += i;
+ files[i].line_alloc = wstr;
files[i].lines = reallocarray(NULL, LINE_COUNT, sizeof(char *));
files[i].lines[0] = wstr;
files[i].lines[1] = wstr;
@@ -185,8 +191,11 @@ test_fgetwln_multi(void)
}
}
- for (i = 0; i < LINE_COUNT; i++)
+ for (i = 0; i < FILE_COUNT; i++) {
+ free(files[i].line_alloc);
+ free(files[i].lines);
pipe_close(files[i].fp);
+ }
}
static void
diff --git a/test/setmode.c b/test/setmode.c
index c6fbcba..c72deb8 100644
--- a/test/setmode.c
+++ b/test/setmode.c
@@ -25,19 +25,31 @@
*/
#include <assert.h>
+#include <stdlib.h>
#include <unistd.h>
int
main(int argc, char **argv)
{
+ void *set;
+
umask(0);
- assert(getmode(setmode("0"), 0) == 0);
+ set = setmode("0");
+ assert(getmode(set, 0) == 0);
+ free(set);
+
+ set = setmode("7777");
+ assert(getmode(set, 0) == 07777);
+ free(set);
- assert(getmode(setmode("7777"), 0) == 07777);
- assert(getmode(setmode("1555"), 0) == 01555);
+ set = setmode("1555");
+ assert(getmode(set, 0) == 01555);
+ free(set);
- assert(getmode(setmode("ugo=rwx"), 0) == 0777);
+ set = setmode("ugo=rwx");
+ assert(getmode(set, 0) == 0777);
+ free(set);
/* FIXME: Complete unit tests. */