diff options
| author | drh <drh@noemail.net> | 2015-05-05 17:12:27 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-05-05 17:12:27 +0000 |
| commit | d689fd3a92428042a0784f7d8eb0fecda8921af8 (patch) | |
| tree | 4d08293a03c01784935430d2c1caed449ad48bb3 /src/test_multiplex.c | |
| parent | b9db90995254891621c116039cef50b5c3606db1 (diff) | |
| parent | 0a96931b76e9b68e73d312bcc479d54b818a26cb (diff) | |
| download | sqlite-d689fd3a92428042a0784f7d8eb0fecda8921af8.tar.gz sqlite-d689fd3a92428042a0784f7d8eb0fecda8921af8.zip | |
Merge all trunk enhancements and fixes into the sessions branch.
FossilOrigin-Name: de7083cfe2bb00b689bec6bcc75e994f564ceda6
Diffstat (limited to 'src/test_multiplex.c')
| -rw-r--r-- | src/test_multiplex.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test_multiplex.c b/src/test_multiplex.c index c1077fbee..843a92ca6 100644 --- a/src/test_multiplex.c +++ b/src/test_multiplex.c @@ -286,7 +286,7 @@ static void multiplexFilename( static int multiplexSubFilename(multiplexGroup *pGroup, int iChunk){ if( iChunk>=pGroup->nReal ){ struct multiplexReal *p; - p = sqlite3_realloc(pGroup->aReal, (iChunk+1)*sizeof(*p)); + p = sqlite3_realloc64(pGroup->aReal, (iChunk+1)*sizeof(*p)); if( p==0 ){ return SQLITE_NOMEM; } @@ -297,7 +297,7 @@ static int multiplexSubFilename(multiplexGroup *pGroup, int iChunk){ if( pGroup->zName && pGroup->aReal[iChunk].z==0 ){ char *z; int n = pGroup->nName; - pGroup->aReal[iChunk].z = z = sqlite3_malloc( n+5 ); + pGroup->aReal[iChunk].z = z = sqlite3_malloc64( n+5 ); if( z==0 ){ return SQLITE_NOMEM; } @@ -357,7 +357,7 @@ static sqlite3_file *multiplexSubOpen( } flags &= ~SQLITE_OPEN_CREATE; } - pSubOpen = sqlite3_malloc( pOrigVfs->szOsFile ); + pSubOpen = sqlite3_malloc64( pOrigVfs->szOsFile ); if( pSubOpen==0 ){ *rc = SQLITE_IOERR_NOMEM; return 0; @@ -524,7 +524,7 @@ static int multiplexOpen( nName = zName ? multiplexStrlen30(zName) : 0; sz = sizeof(multiplexGroup) /* multiplexGroup */ + nName + 1; /* zName */ - pGroup = sqlite3_malloc( sz ); + pGroup = sqlite3_malloc64( sz ); if( pGroup==0 ){ rc = SQLITE_NOMEM; } @@ -655,7 +655,7 @@ static int multiplexDelete( */ int nName = (int)strlen(zName); char *z; - z = sqlite3_malloc(nName + 5); + z = sqlite3_malloc64(nName + 5); if( z==0 ){ rc = SQLITE_IOERR_NOMEM; }else{ |