| Index: third_party/sqlite/sqlite-src-3100200/src/table.c
|
| diff --git a/third_party/sqlite/sqlite-src-3080704/src/table.c b/third_party/sqlite/sqlite-src-3100200/src/table.c
|
| similarity index 95%
|
| copy from third_party/sqlite/sqlite-src-3080704/src/table.c
|
| copy to third_party/sqlite/sqlite-src-3100200/src/table.c
|
| index c435b2bc02ae04d118e6d22d5bad9c1aa915c395..153bfb319f21938ce2d5ba6abefb3aeb213641c0 100644
|
| --- a/third_party/sqlite/sqlite-src-3080704/src/table.c
|
| +++ b/third_party/sqlite/sqlite-src-3100200/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);
|
| }
|
| @@ -126,6 +126,9 @@ int sqlite3_get_table(
|
| int rc;
|
| TabResult res;
|
|
|
| +#ifdef SQLITE_ENABLE_API_ARMOR
|
| + if( !sqlite3SafetyCheckOk(db) || pazResult==0 ) return SQLITE_MISUSE_BKPT;
|
| +#endif
|
| *pazResult = 0;
|
| if( pnColumn ) *pnColumn = 0;
|
| if( pnRow ) *pnRow = 0;
|
| @@ -136,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;
|
| @@ -164,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;
|
|
|