diff options
| author | drh <drh@noemail.net> | 2013-08-06 14:52:27 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-08-06 14:52:27 +0000 |
| commit | 700a7fdf833ce71ee46da1292f96e82afa2dd2f2 (patch) | |
| tree | c1eb7173d6219c5647f6ab9a601de5ff64e8318c /ext/misc/vtshim.c | |
| parent | 7fb30bd0dd4057c203415b7d1d0fe0a15e25a8f7 (diff) | |
| parent | 2d463113f0e374b89bb3b74c1fb65678c1ccc7b5 (diff) | |
| download | sqlite-700a7fdf833ce71ee46da1292f96e82afa2dd2f2.tar.gz sqlite-700a7fdf833ce71ee46da1292f96e82afa2dd2f2.zip | |
Merge in the latest changes from trunk.
FossilOrigin-Name: 69d5bed017bda3e184857febcc8b6f6bed6ad228
Diffstat (limited to 'ext/misc/vtshim.c')
| -rw-r--r-- | ext/misc/vtshim.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/misc/vtshim.c b/ext/misc/vtshim.c index 9e1e495e3..01348e8d3 100644 --- a/ext/misc/vtshim.c +++ b/ext/misc/vtshim.c @@ -429,6 +429,7 @@ static void vtshimAuxDestructor(void *pXAux){ assert( pAux->pAllVtab==0 ); if( !pAux->bDisposed && pAux->xChildDestroy ){ pAux->xChildDestroy(pAux->pChildAux); + pAux->xChildDestroy = 0; } sqlite3_free(pAux->zName); sqlite3_free(pAux->pMod); @@ -527,7 +528,10 @@ void sqlite3_dispose_module(void *pX){ pAux->pMod->xDisconnect(pVtab->pChild); } pAux->bDisposed = 1; - if( pAux->xChildDestroy ) pAux->xChildDestroy(pAux->pChildAux); + if( pAux->xChildDestroy ){ + pAux->xChildDestroy(pAux->pChildAux); + pAux->xChildDestroy = 0; + } } } |