summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-01-20 17:59:37 +0100
committerSergei Golubchik <serg@mariadb.org>2018-01-22 11:39:54 +0100
commitf2408e7e6a39a8544b34e2407a02a084e38e49ba (patch)
tree8e0f17ea21c0cc3ca9acf30b0c8216435ce7df8e /storage
parent36eb0b7a558542689ad654a770c3f1ce8f18dd87 (diff)
downloadmariadb-git-f2408e7e6a39a8544b34e2407a02a084e38e49ba.tar.gz
Free memory in unit tests. Makes ASAN happier.
Diffstat (limited to 'storage')
-rw-r--r--storage/maria/unittest/ma_test_loghandler_multigroup-t.c4
-rw-r--r--storage/maria/unittest/ma_test_loghandler_nologs-t.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
index 56329a18d7d..779128830dc 100644
--- a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
@@ -234,7 +234,7 @@ int main(int argc __attribute__((unused)), char *argv[])
0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA,
0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55
};
- uchar *long_buffer= malloc(LONG_BUFFER_SIZE + LSN_STORE_SIZE * 2 + 2);
+ uchar *long_buffer;
char **default_argv;
PAGECACHE pagecache;
LSN lsn, lsn_base, first_lsn;
@@ -255,6 +255,7 @@ int main(int argc __attribute__((unused)), char *argv[])
}
#endif
+ long_buffer= malloc(LONG_BUFFER_SIZE + LSN_STORE_SIZE * 2 + 2);
load_defaults("my", load_default_groups, &argc, &argv);
get_options(&argc, &argv);
default_argv= argv;
@@ -758,6 +759,7 @@ err:
if (maria_log_remove(maria_data_root))
exit(1);
+ free(long_buffer);
return (test(exit_status()));
}
diff --git a/storage/maria/unittest/ma_test_loghandler_nologs-t.c b/storage/maria/unittest/ma_test_loghandler_nologs-t.c
index 24c93e428e1..06529066305 100644
--- a/storage/maria/unittest/ma_test_loghandler_nologs-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_nologs-t.c
@@ -191,6 +191,7 @@ int main(int argc __attribute__((unused)), char *argv[])
if (maria_log_remove(maria_data_root))
exit(1);
+ free(long_buffer);
exit(0);
}