From: drh <> Date: Fri, 17 Mar 2023 12:25:10 +0000 (+0000) Subject: Ensure that an error does not delete the Table object out from under X-Git-Tag: version-3.41.2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd74c4b2d95b13e3724aaf86fd163bb5183b2312;p=thirdparty%2Fsqlite.git Ensure that an error does not delete the Table object out from under the xConstruct method of a virtual table. dbsqlfuzz 7cc8804a1c6d4e3d554d79096e6ea75a7c1c7d2d FossilOrigin-Name: c5bd0ea3b5b2f3ed8e971c5fd6e85e8f06d8055d74df65612c3794138306e6ba --- diff --git a/manifest b/manifest index 8b7ec6a8c4..f5d2f282d6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Increase\sthe\sversion\snumber\sto\s3.41.2 -D 2023-03-17T10:30:05.659 +C Ensure\sthat\san\serror\sdoes\snot\sdelete\sthe\sTable\sobject\sout\sfrom\sunder\nthe\sxConstruct\smethod\sof\sa\svirtual\stable.\ndbsqlfuzz\s7cc8804a1c6d4e3d554d79096e6ea75a7c1c7d2d +D 2023-03-17T12:25:10.605 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -701,7 +701,7 @@ F src/vdbemem.c 0388576b7cf0be13ce14b9e3b8aa90b8a1b923b60321d0242131ae0b5732b43b F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823 F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac -F src/vtab.c a39f6ed161f16a84ff445af9dba4776b2cf0898be08a33bee8e1128a66c0074b +F src/vtab.c 4516e9fecff8d4f353132be0468bc6424b102937c50c52e01fd9a0a9e9e34ca5 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a @@ -2045,8 +2045,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 9b43b34d81adb1a8fd5e087f6c61387ed3a2e3e604418e295906d220f5cc5254 -R b26ca713935e3420b10d84719410d5ea +P 122f12f5363245a4566dc15ce81ecac5fce70ce9aa478408483f88bd86a8e6bc +Q +df4928c92b0db77d0a40d7b492b609db191252e2f87bca63d000e4fe2e206293 +R f757c2784f525066bfdb03757d86380b U drh -Z 666cde235b7f78fd816e5d1e5e332353 +Z dc70c0046be1ba18aca0eda0a82926d8 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b16b4ed158..892e74e85f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -122f12f5363245a4566dc15ce81ecac5fce70ce9aa478408483f88bd86a8e6bc \ No newline at end of file +c5bd0ea3b5b2f3ed8e971c5fd6e85e8f06d8055d74df65612c3794138306e6ba \ No newline at end of file diff --git a/src/vtab.c b/src/vtab.c index 2dd92762b7..58452dfc5d 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -610,7 +610,9 @@ static int vtabCallConstructor( sCtx.pPrior = db->pVtabCtx; sCtx.bDeclared = 0; db->pVtabCtx = &sCtx; + pTab->nTabRef++; rc = xConstruct(db, pMod->pAux, nArg, azArg, &pVTable->pVtab, &zErr); + sqlite3DeleteTable(db, pTab); db->pVtabCtx = sCtx.pPrior; if( rc==SQLITE_NOMEM ) sqlite3OomFault(db); assert( sCtx.pTab==pTab );