]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Fix for a potential UAF in FTS5.
authordrh <>
Mon, 3 Feb 2025 18:05:54 +0000 (18:05 +0000)
committerdrh <>
Mon, 3 Feb 2025 18:05:54 +0000 (18:05 +0000)
FossilOrigin-Name: e33f2fedda17b4f3678fc23c438093c256b0c125da5f1ac42ecaf3d604d54b6a

1  2 
ext/fts5/fts5_index.c
manifest
manifest.uuid

Simple merge
diff --cc manifest
index 112bf1a5df5df34e5b9c1f09de20361bb2bae634,427775cda2aa9276ccbc00aaf3c7e23b6b580a82..6bc22b6c72644463c999a46f5457014cab8edf88
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improve\sthe\sJS-side\ssqlite3_set_auxdata()\stest\sto\salso\strigger\sthe\scase\sthat\sthe\saux\sdata\sactually\sgets\sreused.\sTest\schanges\sonly,\sno\slibrary\scode.
- D 2025-02-03T18:01:42.876
 -C Fix\sa\suse-after-free\scase\sin\sfts5\sprovoked\sby\sfuzzdata8.db.\sTcl\stest\scase\spending.
 -D 2025-02-03T17:54:55.366
++C Fix\sfor\sa\spotential\sUAF\sin\sFTS5.
++D 2025-02-03T18:05:54.347
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -112,7 -112,7 +112,7 @@@ F ext/fts5/fts5_buffer.c 0eec58bff585f1
  F ext/fts5/fts5_config.c e7d8dd062b44a66cd77e5a0f74f23a2354cd1f3f8575afb967b2773c3384f7f8
  F ext/fts5/fts5_expr.c 69b8d976058512c07dfe86e229521b7a871768157bd1607cedf1a5038dfd72c9
  F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a0ec91b1
- F ext/fts5/fts5_index.c a59ccd06af157da2471f356198af14bc37d86e46231e4e1858b2af2f94c2c6e4
 -F ext/fts5/fts5_index.c 3f04b9bbcb211ad52c466396eb8de4a76506d08db31eb017df1eb69c02b6c5b3
++F ext/fts5/fts5_index.c f1eec0931548b529ddd7ebd274eaef37de7461fe2b0ebdc9818f37324bdf9494
  F ext/fts5/fts5_main.c 9a1daef7247f9b8a50b4159323e340efa6b0e4bea4fcd83580480f94d4f2c888
  F ext/fts5/fts5_storage.c 1ad05dab4830a4e2eaf2900bb143477f93bc17437093582f36f4b818809e88d8
  F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329
@@@ -2209,8 -2205,8 +2209,9 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 3fb993af0caf041da934cea29c039b27c468be0b75bce1537a6425767cf9bf8d
- R b579198e5351884de756285222a8e6ad
- U stephan
- Z a4679fe65a08b67080b3faca6c413001
 -P 8a882f976e22100b91c7ca4119123f16ad5f03311f0a6dc17449bcdcff29618c
 -R 31351815235c0913d39613cb0514c8c6
 -U dan
 -Z cc507b6dc0a3473a2a3bc1fa7ec940f9
++P 9f27379d860518e6e097a2c999da04176812260a61bf11fe495c3efd76971806 a4962df665084e423e020be9a2834b6886a8e3feb461cff5358b61398a2a20d2
++R 0c55f60057cb31a548300850eb056c7d
++T +closed a4962df665084e423e020be9a2834b6886a8e3feb461cff5358b61398a2a20d2
++U drh
++Z ecbc0f1712cef7fa05faf26775dcb9fc
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 9f939bf3fdfc98cd406a2fdf5d638510004fb329,a6434c556de4f27f96002a2208a2e0bbbd1f4cec..2be95918658261c7b36e5fc8c791779932d6f2c1
@@@ -1,1 -1,1 +1,1 @@@
- 9f27379d860518e6e097a2c999da04176812260a61bf11fe495c3efd76971806
 -a4962df665084e423e020be9a2834b6886a8e3feb461cff5358b61398a2a20d2
++e33f2fedda17b4f3678fc23c438093c256b0c125da5f1ac42ecaf3d604d54b6a