diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-21 12:02:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-21 12:03:21 +0300 |
| commit | 948e888097b8ddc22167f2d61726adb0cdd88215 (patch) | |
| tree | f374234b20d56f4e3f9a8baaf477da1f75b78e93 /mysys/my_alloc.c | |
| parent | e07118946a82af60c7cc3804c321d3fd9a49f128 (diff) | |
| parent | 5b25dc6fa4bf63d783e8f8db73abc22ab111143b (diff) | |
| download | mariadb-git-948e888097b8ddc22167f2d61726adb0cdd88215.tar.gz | |
Pull request #868: MDEV-17248 Improve ASAN memory pool instrumentation
Diffstat (limited to 'mysys/my_alloc.c')
| -rw-r--r-- | mysys/my_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 24e95d2c69c..e727f46be6d 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -184,6 +184,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) uchar* point; reg1 USED_MEM *next= 0; reg2 USED_MEM **prev; + size_t original_length = length; DBUG_ENTER("alloc_root"); DBUG_PRINT("enter",("root: 0x%lx", (long) mem_root)); DBUG_ASSERT(alloc_root_inited(mem_root)); @@ -241,7 +242,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) mem_root->used= next; mem_root->first_block_usage= 0; } - TRASH_ALLOC(point, length); + TRASH_ALLOC(point, original_length); DBUG_PRINT("exit",("ptr: 0x%lx", (ulong) point)); DBUG_RETURN((void*) point); #endif |