From: drh <>
Date: Sat, 7 Oct 2023 11:37:00 +0000 (+0000)
Subject: Merge the memory leak fix from trunk.
X-Git-Tag: version-3.45.0~116^2~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=502b11c6d37aaf08b510467a8b7479dca5f3e9db;p=thirdparty%2Fsqlite.git

Merge the memory leak fix from trunk.

FossilOrigin-Name: 358de1b09f3d5ec0fe459775b0a2a99dfa235817327016b472aaa1ed56d952e6
---

502b11c6d37aaf08b510467a8b7479dca5f3e9db
diff --cc manifest
index 5c7372384b,ff15ff5062..1720248ca6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improved\serror\smessages\sfrom\ssearch\son\sJSONB.
- D 2023-10-07T11:36:16.795
 -C Add\sa\stest\scase\sto\sprevent\sa\sregression\sof\sthe\sleak\sfixed\sin\sthe\sprevious\ntrunk\scheck-in.
 -D 2023-10-07T08:15:47.314
++C Merge\sthe\smemory\sleak\sfix\sfrom\strunk.
++D 2023-10-07T11:37:00.963
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -780,12 -780,12 +780,12 @@@ F src/upsert.c fa125a8d3410ce9a97b02cb5
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c e87f66258c37f87724f46e849572c3ece4c74ef5614ba41eb221e98f0dbc95de
  F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 -F src/vdbe.c cd112eb00d20fc5cc44f631d0e713838602637328b0f127c2f3c2aa8cea3cc91
 +F src/vdbe.c 03e66cfa55542c3ae089a1926d06459f8d67cdbad9d52ddc8a7559b7505e90f7
  F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
 -F src/vdbeapi.c 4184402246172220418c0ef49ff4cf1a19ced9a4ac6c843c2f0773fb5c543f37
 +F src/vdbeapi.c b82f465cfaa77cf88c414bc53cb8515523e6840956283cfc7e8d284f72640735
  F src/vdbeaux.c 5b415e09b5b9d5be6c0f4fcbf18ea9d7d16f6a29ced2f14a3b2041020f63e9c1
- F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce
+ F src/vdbeblob.c 4cf5aa130e96e3b52ba3fb54b7f9606c942ab988dbb32cb19cff4db24e06aeec
  F src/vdbemem.c 317b9f48708139db6239ade40c7980b4bc8233168383690d588dad6d8437f722
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
@@@ -2124,8 -2123,8 +2124,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 1f4d3268257bda234c66c3767451b3d39d7b4c7c73a779ad396d9dfc5315905c
- R 473fbbc9196350cff1fe0e5f952691b5
 -P 545edd5ecf20a7feb99dc5ce6f338fa1f172c2e17b240cbede497f0729dbd3d7
 -R a2e5d5a4fe4ffa8a8362a1a5b237104f
++P 96cfdc31e305406123f6ef1b920423f71902dc4b34381c3efb720274343d37cc f99ff655d09763c4a22d065041644ece793d84c82c644931e89ccf50c4f4564a
++R 9cb62826bab57bac8933243b48ca592e
  U drh
- Z ebe282f031d63d9584408df2f4948927
 -Z f7e53533d63cc95fde4932d607956648
++Z cdf0570fe999933e060b2c73f0eb1dc1
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index fc45fd3b7c,46a0d004ac..282aac4978
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 96cfdc31e305406123f6ef1b920423f71902dc4b34381c3efb720274343d37cc
 -f99ff655d09763c4a22d065041644ece793d84c82c644931e89ccf50c4f4564a
++358de1b09f3d5ec0fe459775b0a2a99dfa235817327016b472aaa1ed56d952e6