diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-01 09:14:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-01 10:43:09 +0200 |
| commit | 94e6a226a3145c3cc0871ea5cdc2f8c55ff313ba (patch) | |
| tree | 042060d21c3d31f0356b4bbd1e8634fd8667a3ab /mysys | |
| parent | 6051842cd0b2bdf584e630f89d4fdec42c56908f (diff) | |
| download | mariadb-git-94e6a226a3145c3cc0871ea5cdc2f8c55ff313ba.tar.gz | |
my_malloc(): Invoke TRASH_ALLOC even WITH_SAFEMALLOC=OFF
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_malloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 719c13a040e..99a15e6f432 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -117,6 +117,7 @@ void *my_malloc(size_t size, myf my_flags) MY_TEST(my_flags & MY_THREAD_SPECIFIC)); update_malloc_size(size + MALLOC_PREFIX_SIZE, MY_TEST(my_flags & MY_THREAD_SPECIFIC)); + TRASH_ALLOC(point, size); DBUG_EXECUTE_IF("simulate_out_of_memory", { /* my_free() handles memory accounting */ |