diff options
| -rw-r--r-- | manifest | 15 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/insert.c | 3 |
3 files changed, 11 insertions, 9 deletions
@@ -1,5 +1,5 @@ -C Fix\sa\smemory\sleak\sin\stest\scode\son\sthis\sbranch. -D 2021-10-30T17:58:25.337 +C Add\sthe\ssqlite3_autovacuum_pages()\sinterface. +D 2021-10-30T20:22:32.855 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -510,7 +510,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 -F src/insert.c 137038155adad9f00ba4e2c2602eec0335d6ef5ff0c3958c02f778657006dc59 +F src/insert.c 3f2892de7820d8e0b34a90bff8a3e2f879bc528683fa2ebb9e779ae56b64b741 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c F src/main.c 546dd2418c4f5d59aced76c68e55290735feb420ee305051fbd55ab8fff0d255 @@ -1930,7 +1930,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 638c1b0c50229800067eb1ba29d829b4d6e008256c21a1f67b4ce4d19ea307b3 -R b67db243b6924a0dd8b6ad442b112d32 -U dan -Z acc4c348ad53723d2b572854bf9ea0ca +P 623c0d086bda135c49bfc238c31498facdcbe8ecc7659cc1af61594df0c6e899 60cd9da9258e0b701d4bb3f9c91c5d0a12e925b9b937df619b09f33a287b4a33 +R c2365c0f257a6e1be84889548b719edd +T +closed 60cd9da9258e0b701d4bb3f9c91c5d0a12e925b9b937df619b09f33a287b4a33 +U drh +Z 46db034af6d2112bb92acfe1ff1351cf diff --git a/manifest.uuid b/manifest.uuid index ca2c021ff..0e9b7b257 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -60cd9da9258e0b701d4bb3f9c91c5d0a12e925b9b937df619b09f33a287b4a33
\ No newline at end of file +ca2703c339f76101f25051a2ed380398b018782883bfee68b5f2d69a1de9091a
\ No newline at end of file diff --git a/src/insert.c b/src/insert.c index 9b3b195f6..400f2caaf 100644 --- a/src/insert.c +++ b/src/insert.c @@ -2327,7 +2327,8 @@ void sqlite3GenerateConstraintChecks( assert( onError==OE_Replace ); nConflictCk = sqlite3VdbeCurrentAddr(v) - addrConflictCk; - assert( nConflictCk>0 ); + assert( nConflictCk>0 || db->mallocFailed ); + testcase( nConflictCk<=0 ); testcase( nConflictCk>1 ); if( regTrigCnt ){ sqlite3MultiWrite(pParse); |