From: drh <> Date: Mon, 6 Dec 2021 16:42:31 +0000 (+0000) Subject: Fix SQLITE_TESTCTRL_IMPOSTER so that it is a harmless no-op if the schema X-Git-Tag: version-3.37.1~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7956fbb7b6eeecd62bdbafdd52be3e618d7d8ba9;p=thirdparty%2Fsqlite.git Fix SQLITE_TESTCTRL_IMPOSTER so that it is a harmless no-op if the schema parameter is invalid. FossilOrigin-Name: b15c553c2ca3143c269e25f41e1a4e6c00f72a89e4b0a382260620567f159081 --- diff --git a/manifest b/manifest index af75137a65..066dd3fd25 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\sthe\sshell\stool,\savoid\smodifying\sinternal\sdata\sstructures\suntil\safter\sthe\sarguments\sto\s".open"\shave\sbeen\sparsed. -D 2021-12-06T16:36:37.667 +C Fix\sSQLITE_TESTCTRL_IMPOSTER\sso\sthat\sit\sis\sa\sharmless\sno-op\sif\sthe\sschema\nparameter\sis\sinvalid. +D 2021-12-06T16:42:31.658 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -514,7 +514,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 7fcbbe9114ac402ea3c0c6a3810f13fc89cae8131ea1659ec472be7caac10192 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c -F src/main.c 7bd4fdc41ef53535271a1816ff043ba153cda03842b444b6e2f57b27b2cb9090 +F src/main.c e94230dba03f44b73c52abc8b814468a0cb6d4a66d71af33452edd78ed1b1228 F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@ -1933,8 +1933,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P cea9e41aaee9b43496909fa2ba80dddaee1dd77d44bcb4d8d38034d1b003d762 -Q +fcc509d325dabe06275e7804183bb8b4ba6470a45b443bc8292eecd0974e6367 -R 29ff6f0ab37b56a9972cccaffdc627cd +P cbd69ed8afd3facda39fe8c81a3e8e4a1928923bcfd93e99d1bb8b3868ef3e5b +Q +2d9a45ab10aaad681e11d639195430c0988b6ca1b96db6bf0b31b889e88a5430 +R 6ff1e713f602aa09b26aa85d4ecde7a6 U drh -Z a94d193d2ea331fde75cdd8dc9044784 +Z ff7b20be846cfbdcbb432488413e7c4a diff --git a/manifest.uuid b/manifest.uuid index f72a3cbb67..286308488b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cbd69ed8afd3facda39fe8c81a3e8e4a1928923bcfd93e99d1bb8b3868ef3e5b \ No newline at end of file +b15c553c2ca3143c269e25f41e1a4e6c00f72a89e4b0a382260620567f159081 \ No newline at end of file diff --git a/src/main.c b/src/main.c index 4b2d0592c9..ce53496bc0 100644 --- a/src/main.c +++ b/src/main.c @@ -4260,12 +4260,16 @@ int sqlite3_test_control(int op, ...){ */ case SQLITE_TESTCTRL_IMPOSTER: { sqlite3 *db = va_arg(ap, sqlite3*); + int iDb; sqlite3_mutex_enter(db->mutex); - db->init.iDb = sqlite3FindDbName(db, va_arg(ap,const char*)); - db->init.busy = db->init.imposterTable = va_arg(ap,int); - db->init.newTnum = va_arg(ap,int); - if( db->init.busy==0 && db->init.newTnum>0 ){ - sqlite3ResetAllSchemasOfConnection(db); + iDb = sqlite3FindDbName(db, va_arg(ap,const char*)); + if( iDb>=0 ){ + db->init.iDb = iDb; + db->init.busy = db->init.imposterTable = va_arg(ap,int); + db->init.newTnum = va_arg(ap,int); + if( db->init.busy==0 && db->init.newTnum>0 ){ + sqlite3ResetAllSchemasOfConnection(db); + } } sqlite3_mutex_leave(db->mutex); break;