aboutsummaryrefslogtreecommitdiff
path: root/src/test_malloc.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2015-04-22 09:40:35 +0000
committerdan <dan@noemail.net>2015-04-22 09:40:35 +0000
commit062c267dffc17aeea9e41c8a553bc7f20a949e04 (patch)
tree8b0be371e782c9cb20665994bb92c2ec48d27924 /src/test_malloc.c
parent5bb97c2b801248ab08b37b99926962f7db5c0e09 (diff)
parent318d38cf7e16d0f47dc982c33e80792e06a6fff6 (diff)
downloadsqlite-062c267dffc17aeea9e41c8a553bc7f20a949e04.tar.gz
sqlite-062c267dffc17aeea9e41c8a553bc7f20a949e04.zip
Update this branch with latest trunk changes.
FossilOrigin-Name: 9797482ded7de985e3b20aedec5e4d81f55065c8
Diffstat (limited to 'src/test_malloc.c')
-rw-r--r--src/test_malloc.c10
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);