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/table.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/table.c')
| -rw-r--r-- | src/table.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/table.c b/src/table.c index 235d8dd3d..153bfb319 100644 --- a/src/table.c +++ b/src/table.c @@ -90,7 +90,7 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){ z = 0; }else{ int n = sqlite3Strlen30(argv[i])+1; - z = sqlite3_malloc( n ); + z = sqlite3_malloc64( n ); if( z==0 ) goto malloc_failed; memcpy(z, argv[i], n); } @@ -139,7 +139,7 @@ int sqlite3_get_table( res.nData = 1; res.nAlloc = 20; res.rc = SQLITE_OK; - res.azResult = sqlite3_malloc(sizeof(char*)*res.nAlloc ); + res.azResult = sqlite3_malloc64(sizeof(char*)*res.nAlloc ); if( res.azResult==0 ){ db->errCode = SQLITE_NOMEM; return SQLITE_NOMEM; @@ -167,7 +167,7 @@ int sqlite3_get_table( } if( res.nAlloc>res.nData ){ char **azNew; - azNew = sqlite3_realloc( res.azResult, sizeof(char*)*res.nData ); + azNew = sqlite3_realloc64( res.azResult, sizeof(char*)*res.nData ); if( azNew==0 ){ sqlite3_free_table(&res.azResult[1]); db->errCode = SQLITE_NOMEM; |