diff options
| author | dan <dan@noemail.net> | 2015-04-23 19:32:19 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-04-23 19:32:19 +0000 |
| commit | e11afed5620d285f0d4d9dcb67e36cae8b152ac2 (patch) | |
| tree | 633f5e366c1dca38bd2cb71f9e42b069665c6548 /src/test_malloc.c | |
| parent | 55d46f01c52848d403f4ea48f391fbb389bb2013 (diff) | |
| parent | 41148f83c47b0d196f9d11aaad89d3528ecb4830 (diff) | |
| download | sqlite-e11afed5620d285f0d4d9dcb67e36cae8b152ac2.tar.gz sqlite-e11afed5620d285f0d4d9dcb67e36cae8b152ac2.zip | |
Merge latest trunk changes into this branch.
FossilOrigin-Name: 1506e99eca19f72fb59b55ec9e2534505dfa7a6e
Diffstat (limited to 'src/test_malloc.c')
| -rw-r--r-- | src/test_malloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test_malloc.c b/src/test_malloc.c index 1ea4de506..94a228292 100644 --- a/src/test_malloc.c +++ b/src/test_malloc.c @@ -211,15 +211,15 @@ static int faultsimInstall(int install){ faultsimBeginBenign, faultsimEndBenign ); }else{ - sqlite3_mem_methods m; + sqlite3_mem_methods m2; assert(memfault.m.xMalloc); /* One should be able to reset the default memory allocator by storing ** a zeroed allocator then calling GETMALLOC. */ - memset(&m, 0, sizeof(m)); - sqlite3_config(SQLITE_CONFIG_MALLOC, &m); - sqlite3_config(SQLITE_CONFIG_GETMALLOC, &m); - assert( memcmp(&m, &memfault.m, sizeof(m))==0 ); + memset(&m2, 0, sizeof(m2)); + sqlite3_config(SQLITE_CONFIG_MALLOC, &m2); + sqlite3_config(SQLITE_CONFIG_GETMALLOC, &m2); + assert( memcmp(&m2, &memfault.m, sizeof(m2))==0 ); rc = sqlite3_config(SQLITE_CONFIG_MALLOC, &memfault.m); sqlite3_test_control(SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS, 0, 0); |