database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Fix an issue with P4_MEM and the schema size measurement logic. Also fix

Browse Source 
a compiler warning.

FossilOrigin-Name: 8166f33885b86029bb8a0fbaf70606a0d2d5ec2e
This commit is contained in:
drh
2010-07-26 13:57:59 +00:00
parent 7043db9f6f
commit c176c27cbc
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vdbeaux.c
View File

@@ -607,7 +607,11 @@ static void freeP4(sqlite3 *db, int p4type, void *p4){
break;
}
case P4_MEM: {
sqlite3ValueFree((sqlite3_value*)p4);
if( db->pnBytesFreed==0 ){
sqlite3ValueFree((sqlite3_value*)p4);
}else{
sqlite3DbFree(db, ((Mem*)p4)->zMalloc);
}
break;
}
case P4_VTAB : {
@@ -989,7 +993,8 @@ static void releaseMemArray(Mem *p, int N){
for(pEnd=&p[N]; p<pEnd; p++){
sqlite3DbFree(db, p->zMalloc);
}
}else
return;
}
for(pEnd=&p[N]; p<pEnd; p++){
assert( (&p[1])==pEnd || p[0].db==p[1].db );