status-im/sqlcipher
1
0
Fork 0
mirror of https://github.com/status-im/sqlcipher.git synced 2026-08-30 22:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix memory initialization

Browse Source
This commit is contained in:
Stephen Lombardo
2018-10-30 09:42:03 -04:00
parent ca4b36a61a
commit b0c7b629ad
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/malloc.c
+9 -10
View File
@@ -111,7 +111,7 @@ int sqlite3MallocInit(void){
int rc;
if( sqlite3GlobalConfig.m.xMalloc==0 ){
sqlite3MemSetDefault();
}
memset(&mem0, 0, sizeof(mem0));
mem0.mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MEM);
if( sqlite3GlobalConfig.pPage==0 || sqlite3GlobalConfig.szPage<512
@@ -121,18 +121,17 @@ int sqlite3MallocInit(void){
}
rc = sqlite3GlobalConfig.m.xInit(sqlite3GlobalConfig.m.pAppData);
if( rc!=SQLITE_OK ) memset(&mem0, 0, sizeof(mem0));
/* BEGIN SQLCIPHER */
/* BEGIN SQLCIPHER */
#ifdef SQLITE_HAS_CODEC
/* install wrapping functions for memory management
that will wipe all memory allocated by SQLite
when freed */
{
extern void sqlcipher_init_memmethods();
sqlcipher_init_memmethods();
}
/* install wrapping functions for memory management
that will wipe all memory allocated by SQLite
when freed */
if( rc==SQLITE_OK ) {
extern void sqlcipher_init_memmethods();
sqlcipher_init_memmethods();
}
#endif
/* END SQLCIPHER */
}
return rc;
}