database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge changes from trunk.

Browse Source 
FossilOrigin-Name: dddd792dedf0c73ebe74b4ff8d303e6216c16b6a
This commit is contained in:
drh
2015-08-19 12:52:51 +00:00
parent 51be3873c0 0e07f6ae40
commit b89c92a615
5 changed files with 139 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vtab.c
View File

@@ -276,7 +276,6 @@ void sqlite3VtabClear(sqlite3 *db, Table *p){
if( i!=1 ) sqlite3DbFree(db, p->azModuleArg[i]);
}
sqlite3DbFree(db, p->azModuleArg);
p->azModuleArg = 0;
}
}
@@ -287,23 +286,17 @@ void sqlite3VtabClear(sqlite3 *db, Table *p){
** deleted.
*/
static void addModuleArgument(sqlite3 *db, Table *pTable, char *zArg){
int i = pTable->nModuleArg++;
int nBytes = sizeof(char *)*(1+pTable->nModuleArg);
int nBytes = sizeof(char *)*(2+pTable->nModuleArg);
char **azModuleArg;
azModuleArg = sqlite3DbRealloc(db, pTable->azModuleArg, nBytes);
if( azModuleArg==0 ){
int j;
for(j=0; j<i; j++){
sqlite3DbFree(db, pTable->azModuleArg[j]);
}
sqlite3DbFree(db, zArg);
sqlite3DbFree(db, pTable->azModuleArg);
pTable->nModuleArg = 0;
}else{
int i = pTable->nModuleArg++;
azModuleArg[i] = zArg;
azModuleArg[i+1] = 0;
pTable->azModuleArg = azModuleArg;
}
pTable->azModuleArg = azModuleArg;
}
/*