From: drh <>
Date: Sat, 12 Jun 2021 18:12:59 +0000 (+0000)
Subject: The sqlite3WithPush() routine might destroy its second argument if there was
X-Git-Tag: version-3.36.0~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2078e025b1a3b157d99ab24f2f2bdfb54a2af1f;p=thirdparty%2Fsqlite.git

The sqlite3WithPush() routine might destroy its second argument if there was
a prior OOM.  Do not use the second argument of sqlite3WithPush() if this
happens.

FossilOrigin-Name: baa3f96250763b42391fbb4dea283a4b6140fdbf775d85081a9efd6e6258f7b4
---

a2078e025b1a3b157d99ab24f2f2bdfb54a2af1f
diff --cc manifest
index 19ea042367,f2d668bfdc..f5d5c51695
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Reapply\stwo\srecent\sALTER\sTABLE\serror\schecks\sthat\sturned\sout\sto\sbe\snecessary\nafter\sall.\s\sdbsqlfuzz\sfc5a9deefda00dda914748985155a6d4c44174e5.
- D 2021-06-11T13:18:56.772
 -C This\sis\san\salternative\sapproach\sto\sthe\suse-after-free\sproblem\sfixed\nby\s[193b14a58e378ab3],\ssaved\shere\sfor\shistorical\sreference.
 -D 2021-06-12T17:45:32.816
++C The\ssqlite3WithPush()\sroutine\smight\sdestroy\sits\ssecond\sargument\sif\sthere\swas\na\sprior\sOOM.\s\sDo\snot\suse\sthe\ssecond\sargument\sof\ssqlite3WithPush()\sif\sthis\nhappens.
++D 2021-06-12T18:12:59.775
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1918,9 -1918,11 +1918,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 01f3877c7172d52225705d2461addc6129fe9cdb04e6f643518fc74bb4b526e4
- Q -6f1f2a0a9cd75ca43b81cc325296b843ccefe6f8040da8f2e873f49928423f10
- Q -852ee0e91ceae090157c4ab2805530f5d7985a490ce77f54d7b148f56e466f79
- R 209079f8bae7abdeeccb2384f599febc
 -P 230fedd923c87741d20caf55f29e8464cc6df344536f9b89331e0a0059a926f7
++P 230fedd923c87741d20caf55f29e8464cc6df344536f9b89331e0a0059a926f7 6796b7a2485eca279db9d777595a886bc0d1dd7ec9551e1797e0032ef5493559
+ R ba0b1c0a7ea04e269896819b2a1250df
 -T *branch * alternative-oom-fix
 -T *sym-alternative-oom-fix *
 -T +closed *
 -T -sym-trunk *
++T +closed 6796b7a2485eca279db9d777595a886bc0d1dd7ec9551e1797e0032ef5493559
  U drh
- Z 7b5e924ec5b470cee8adabc26d15dbda
 -Z af6dd9a5ef0fe38928295fa12b9f4a20
++Z c3c98555039acb2765b853d05e7fc36d
diff --cc manifest.uuid
index 17a890722c,be1fb81af0..d99f1db1ce
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 230fedd923c87741d20caf55f29e8464cc6df344536f9b89331e0a0059a926f7
 -6796b7a2485eca279db9d777595a886bc0d1dd7ec9551e1797e0032ef5493559
++baa3f96250763b42391fbb4dea283a4b6140fdbf775d85081a9efd6e6258f7b4