erdbpro 3.4.7-rc.47 → 3.4.7-rc.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (581) hide show
  1. package/README.md +2 -2
  2. package/dist/assets/{AdminRoute-DSB9B8y1.js → AdminRoute-C2Byigil.js} +2 -2
  3. package/dist/assets/{Combination-DKEtBTYK.js → Combination-DW372nTG.js} +1 -1
  4. package/dist/assets/{DataViewerModeToolbar-CsbPi8Qu.js → DataViewerModeToolbar-Dq8eYuAi.js} +1 -1
  5. package/dist/assets/{DbClientEditorRoute-CWv5FRDk.js → DbClientEditorRoute-DmOWUM9A.js} +1 -1
  6. package/dist/assets/{DiagramEditorRoute-DnGNnAAk.js → DiagramEditorRoute-BkLgCF5C.js} +1 -1
  7. package/dist/assets/{DrawingEditorRoute-FudyZHrS.js → DrawingEditorRoute-jlxNIOiU.js} +2 -2
  8. package/dist/assets/{DrawingsView-BRV2DA94.js → DrawingsView-a5bpENhf.js} +8 -8
  9. package/dist/assets/{ERDComments-Nt3nBiji.js → ERDComments-CQxiGmX0.js} +1 -1
  10. package/dist/assets/{FlowchartEditorRoute-BhNaUat0.js → FlowchartEditorRoute-DNlK-gON.js} +1 -1
  11. package/dist/assets/{JumpToNode-CCYQODCF.js → JumpToNode-jNp5PjDD.js} +1 -1
  12. package/dist/assets/{LibraryRoute-BusgJnfj.js → LibraryRoute-wQ3DjDiC.js} +1 -1
  13. package/dist/assets/{NoteEditorRoute-BjZiIaa_.js → NoteEditorRoute-BWw7th-s.js} +2 -2
  14. package/dist/assets/{NotesView-By7suv_d.js → NotesView-rB_d0kZC.js} +1 -1
  15. package/dist/assets/{TeamInventoryRoute-CA2YlH5P.js → TeamInventoryRoute-Djz5321a.js} +1 -1
  16. package/dist/assets/{TeamManagementRoute-DJRRdWJ6.js → TeamManagementRoute-B4giM01n.js} +1 -1
  17. package/dist/assets/{TrashView-bl9PDMiN.js → TrashView-Bh2MYh5U.js} +1 -1
  18. package/dist/assets/{UserManagementRoute-PEDKPI-X.js → UserManagementRoute-BIgktsop.js} +1 -1
  19. package/dist/assets/WorkspaceProvider-CUHbe67J.js +73 -0
  20. package/dist/assets/{abnfDiagram-VCTEODGH-CHtfaEcP.js → abnfDiagram-VCTEODGH-BAIoLRp_.js} +1 -1
  21. package/dist/assets/{app-Dwb58oCT.js → app-Aufmny-7.js} +1 -1
  22. package/dist/assets/{ar-SA-G6X2FPQ2-BlZjF06Y.js → ar-SA-G6X2FPQ2-CbDZD5F3.js} +1 -1
  23. package/dist/assets/{architectureDiagram-5GKGNRK7-CyiLJijj.js → architectureDiagram-5GKGNRK7-BMrdpeiI.js} +1 -1
  24. package/dist/assets/{az-AZ-76LH7QW2-CBmDykbA.js → az-AZ-76LH7QW2-BtYDQkLc.js} +1 -1
  25. package/dist/assets/{bg-BG-XCXSNQG7-C35a0Z0X.js → bg-BG-XCXSNQG7-6PbrUNfG.js} +1 -1
  26. package/dist/assets/{blockDiagram-I7D4REHJ-BfZ9AVZ9.js → blockDiagram-I7D4REHJ-vUYtE_bD.js} +1 -1
  27. package/dist/assets/{bn-BD-2XOGV67Q-y6lBbGSz.js → bn-BD-2XOGV67Q-ChlNnCFJ.js} +1 -1
  28. package/dist/assets/{c4Diagram-7LVT6UL2-D2n4AnpS.js → c4Diagram-7LVT6UL2-BDQX_95N.js} +1 -1
  29. package/dist/assets/{ca-ES-6MX7JW3Y-lFwUhthM.js → ca-ES-6MX7JW3Y-BflLI8qD.js} +1 -1
  30. package/dist/assets/channel-BkaA_5Fn.js +1 -0
  31. package/dist/assets/{chunk-4HAMMTFA-dqAwgK-j.js → chunk-4HAMMTFA-BQ3RJ6kZ.js} +1 -1
  32. package/dist/assets/{chunk-75Z2AOVW-DzHf0lKD.js → chunk-75Z2AOVW-DnGkH3Fi.js} +1 -1
  33. package/dist/assets/{chunk-DU6HZSFF-_EnQXL-g.js → chunk-DU6HZSFF-C7fySbpO.js} +1 -1
  34. package/dist/assets/{chunk-EIO257PC-lBRMcS1x.js → chunk-EIO257PC-DBABEwco.js} +1 -1
  35. package/dist/assets/{chunk-F27PBJKO-BBfO5auC.js → chunk-F27PBJKO-DMllmfk5.js} +1 -1
  36. package/dist/assets/{chunk-GMAD6QVW-BPtYDRp3.js → chunk-GMAD6QVW-CRHWleRn.js} +1 -1
  37. package/dist/assets/{chunk-GVQU2GXP-C4pY4HtR.js → chunk-GVQU2GXP-D5OZX0x5.js} +1 -1
  38. package/dist/assets/{chunk-IMKFNOWR-BXfFybHp.js → chunk-IMKFNOWR-ZWotsfm4.js} +1 -1
  39. package/dist/assets/{chunk-L3NEJ4N5-DmNwlH_z.js → chunk-L3NEJ4N5-D45kHPWp.js} +1 -1
  40. package/dist/assets/{chunk-OSK3NFVY-CnPVCBud.js → chunk-OSK3NFVY-WsCl5PR6.js} +1 -1
  41. package/dist/assets/{chunk-P2QGCYS3-BqTitF5q.js → chunk-P2QGCYS3-hyHJdGXr.js} +1 -1
  42. package/dist/assets/{chunk-POPQ4Y6H-Dg2pDVNx.js → chunk-POPQ4Y6H-BH-QTQkm.js} +1 -1
  43. package/dist/assets/{chunk-PWAF6VOD-CEJB4028.js → chunk-PWAF6VOD-YewFENXX.js} +1 -1
  44. package/dist/assets/{chunk-SHT3W25Y-Bax-VB_I.js → chunk-SHT3W25Y-xW7rUwXR.js} +1 -1
  45. package/dist/assets/{chunk-SVP7TREG-CuCjB727.js → chunk-SVP7TREG-BqriYbzc.js} +1 -1
  46. package/dist/assets/{chunk-TICWLB2K-JoqGLYD1.js → chunk-TICWLB2K-BrJ1eMPp.js} +1 -1
  47. package/dist/assets/classDiagram-ZZMXUADV-BrWfLDhC.js +1 -0
  48. package/dist/assets/classDiagram-v2-VYDZK3BY-BrWfLDhC.js +1 -0
  49. package/dist/assets/core-5A5Ti_Rw.js +1 -0
  50. package/dist/assets/{cs-CZ-2BRQDIVT-C84yiIw1.js → cs-CZ-2BRQDIVT-d_m4Vygp.js} +1 -1
  51. package/dist/assets/{cynefinDiagram-5FMLGOSQ-B19Z28l1.js → cynefinDiagram-5FMLGOSQ-B8uS0IPY.js} +1 -1
  52. package/dist/assets/{da-DK-5WZEPLOC-B6csge1M.js → da-DK-5WZEPLOC-DVGEJl5r.js} +1 -1
  53. package/dist/assets/{dagre-GXQ25YYZ-CUclL1Wl.js → dagre-GXQ25YYZ-DWnIGdBz.js} +1 -1
  54. package/dist/assets/{de-DE-XR44H4JA-DyZpt2RZ.js → de-DE-XR44H4JA-BTbSBzRp.js} +1 -1
  55. package/dist/assets/{diagram-S7CK7UJ4-DUmm1JXR.js → diagram-S7CK7UJ4-DxVo0KoG.js} +1 -1
  56. package/dist/assets/{diagram-UQ7AKVKN-BoHq54Hb.js → diagram-UQ7AKVKN-DKDMTsLx.js} +1 -1
  57. package/dist/assets/{diagram-VSXAHHWV-TXATXgII.js → diagram-VSXAHHWV-CFMva9Sx.js} +1 -1
  58. package/dist/assets/{diagram-VX7I27RA-DpQriQGe.js → diagram-VX7I27RA-C2XBwWd-.js} +1 -1
  59. package/dist/assets/{diagram-Z3DM3KII-Cqtp8nmX.js → diagram-Z3DM3KII-CS_QI2ql.js} +1 -1
  60. package/dist/assets/{dist-BgDsBfsT.js → dist-SYEVzHJW.js} +4 -4
  61. package/dist/assets/dist-js-CGfv5pu7.js +1 -0
  62. package/dist/assets/dist-js-DBVGO9-Q.js +1 -0
  63. package/dist/assets/{ebnfDiagram-PWID7BFC-CL4qL4yL.js → ebnfDiagram-PWID7BFC-CSzsw0YD.js} +1 -1
  64. package/dist/assets/{el-GR-BZB4AONW-Cqpu6u0J.js → el-GR-BZB4AONW-CjdnNYLp.js} +1 -1
  65. package/dist/assets/{en-B4ZKOASM-BD009MVF.js → en-B4ZKOASM-N7Y37Y6P.js} +1 -1
  66. package/dist/assets/{erDiagram-RLTQ6QDP-DUcwTYsO.js → erDiagram-RLTQ6QDP-CiDUDQ_p.js} +1 -1
  67. package/dist/assets/{erdActions--HZ73-Kk.js → erdActions-CQ6Jzfsn.js} +1 -1
  68. package/dist/assets/{es-ES-U4NZUMDT-B7MJwYfB.js → es-ES-U4NZUMDT-YcIiGQv9.js} +1 -1
  69. package/dist/assets/{eu-ES-A7QVB2H4-CqmAVa8M.js → eu-ES-A7QVB2H4-CI0yr4ie.js} +1 -1
  70. package/dist/assets/{event-DtFyPu7u.js → event-C6gFlqUR.js} +1 -1
  71. package/dist/assets/{fa-IR-HGAKTJCU-EhMHzELv.js → fa-IR-HGAKTJCU-BiTK7W_d.js} +1 -1
  72. package/dist/assets/{fi-FI-Z5N7JZ37-BUTBh3w5.js → fi-FI-Z5N7JZ37-BoaBy7uQ.js} +1 -1
  73. package/dist/assets/flowDiagram-HODETNUW-Cz9_9O45.js +1 -0
  74. package/dist/assets/{fr-FR-RHASNOE6-3V94QdxI.js → fr-FR-RHASNOE6-olj7vp1r.js} +1 -1
  75. package/dist/assets/{ganttDiagram-EL5Y4UJY-C3uXRwCy.js → ganttDiagram-EL5Y4UJY-C1QPTERU.js} +1 -1
  76. package/dist/assets/{gitGraphDiagram-WWUBYQGX-i4M1rDYj.js → gitGraphDiagram-WWUBYQGX-K4DaeeHA.js} +1 -1
  77. package/dist/assets/{gl-ES-HMX3MZ6V-DXqpTggY.js → gl-ES-HMX3MZ6V-Dzae7kYu.js} +1 -1
  78. package/dist/assets/{he-IL-6SHJWFNN-D8O2I5co.js → he-IL-6SHJWFNN-BGzfl4yq.js} +1 -1
  79. package/dist/assets/{hi-IN-IWLTKZ5I-CffAmud1.js → hi-IN-IWLTKZ5I-DwmffUY3.js} +1 -1
  80. package/dist/assets/{hu-HU-A5ZG7DT2-B-9JsF-V.js → hu-HU-A5ZG7DT2-BBCdwsdF.js} +1 -1
  81. package/dist/assets/{id-ID-SAP4L64H-DbdBIiJs.js → id-ID-SAP4L64H-CS0nJ_Bi.js} +1 -1
  82. package/dist/assets/{image-GAAHSSAO-4jV5hvR9.js → image-GAAHSSAO-B8WbdpJC.js} +1 -1
  83. package/dist/assets/image-J9TY7xbU.js +1 -0
  84. package/dist/assets/index-KDkPqrmT.css +1 -0
  85. package/dist/assets/{index-DeSNoafS.js → index-L8fwt97H.js} +165 -165
  86. package/dist/assets/{infoDiagram-27XIBGKW-yxTJzT4j.js → infoDiagram-27XIBGKW-CKWOzu9s.js} +1 -1
  87. package/dist/assets/{ishikawaDiagram-5VMMS53U-BB897JIY.js → ishikawaDiagram-5VMMS53U-DeUWtgQg.js} +1 -1
  88. package/dist/assets/{it-IT-JPQ66NNP-BGDxDtxg.js → it-IT-JPQ66NNP-BvPMCdZF.js} +1 -1
  89. package/dist/assets/{ja-JP-DBVTYXUO-DmkD5gLK.js → ja-JP-DBVTYXUO-x07_X7qa.js} +1 -1
  90. package/dist/assets/{journeyDiagram-3NMN7TZE-BrHicsTu.js → journeyDiagram-3NMN7TZE-CMPXCj_c.js} +1 -1
  91. package/dist/assets/{kaa-6HZHGXH3-BjbzQu3l.js → kaa-6HZHGXH3-CxBCImY9.js} +1 -1
  92. package/dist/assets/{kab-KAB-ZGHBKWFO-V2_5qc6O.js → kab-KAB-ZGHBKWFO-DVathhSn.js} +1 -1
  93. package/dist/assets/{kanban-definition-UXKFOSKX-Mg8YPLHa.js → kanban-definition-UXKFOSKX-CUML9Icw.js} +1 -1
  94. package/dist/assets/{kk-KZ-P5N5QNE5-ceqlBXdP.js → kk-KZ-P5N5QNE5-C7JOyEOh.js} +1 -1
  95. package/dist/assets/{km-KH-HSX4SM5Z-DxeA2VKc.js → km-KH-HSX4SM5Z-CvuzHfQF.js} +1 -1
  96. package/dist/assets/{ko-KR-MTYHY66A-B7C1F5iR.js → ko-KR-MTYHY66A-CeVnpuWh.js} +1 -1
  97. package/dist/assets/{ku-TR-6OUDTVRD-DPAu2bmf.js → ku-TR-6OUDTVRD-DFvrErSf.js} +1 -1
  98. package/dist/assets/{line-BdJdIdKM.js → line-BNf4RMFD.js} +1 -1
  99. package/dist/assets/{lt-LT-XHIRWOB4-Ckj5eWuf.js → lt-LT-XHIRWOB4-CaHhfLHS.js} +1 -1
  100. package/dist/assets/{lv-LV-5QDEKY6T-65QPgprT.js → lv-LV-5QDEKY6T-DEqITY8t.js} +1 -1
  101. package/dist/assets/{mindmap-definition-YA3MSWOX-B7rOG1rO.js → mindmap-definition-YA3MSWOX-D2x1O1lE.js} +1 -1
  102. package/dist/assets/{mr-IN-CRQNXWMA-QTChq62n.js → mr-IN-CRQNXWMA-BEscEg1Q.js} +1 -1
  103. package/dist/assets/{my-MM-5M5IBNSE-B63SOomX.js → my-MM-5M5IBNSE-Cz8bHHy5.js} +1 -1
  104. package/dist/assets/{nb-NO-T6EIAALU-B29zhWcO.js → nb-NO-T6EIAALU-D2MAPpd8.js} +1 -1
  105. package/dist/assets/{nl-NL-IS3SIHDZ-DfIlq8vl.js → nl-NL-IS3SIHDZ-Vw1F4ce3.js} +1 -1
  106. package/dist/assets/{nn-NO-6E72VCQL-Dqu-9WEr.js → nn-NO-6E72VCQL-DHS2w2nS.js} +1 -1
  107. package/dist/assets/{note-importer-L116LJVw.js → note-importer-lW-D3qks.js} +2 -2
  108. package/dist/assets/{oc-FR-POXYY2M6-CHerJSTG.js → oc-FR-POXYY2M6-Zuct0uma.js} +1 -1
  109. package/dist/assets/{pa-IN-N4M65BXN-5BMs5Qbz.js → pa-IN-N4M65BXN-COgg_lZe.js} +1 -1
  110. package/dist/assets/{pegDiagram-XKGWAZYB-DWBwBkCw.js → pegDiagram-XKGWAZYB-DaPYJVM9.js} +1 -1
  111. package/dist/assets/percentages-BXMCSKIN-BpHVYqkw.js +1 -0
  112. package/dist/assets/{pieDiagram-E7YTZNPT-BxGiC3k8.js → pieDiagram-E7YTZNPT-DoKXN_iZ.js} +1 -1
  113. package/dist/assets/{pl-PL-T2D74RX3-B-tdaBmr.js → pl-PL-T2D74RX3-YC95BRZF.js} +1 -1
  114. package/dist/assets/{popover-DA6l6KYU.js → popover-D6xoQY9Y.js} +1 -1
  115. package/dist/assets/{pt-BR-5N22H2LF-Cyyf5vAW.js → pt-BR-5N22H2LF-erm7c0dr.js} +1 -1
  116. package/dist/assets/{pt-PT-UZXXM6DQ-BjTJ5Iou.js → pt-PT-UZXXM6DQ-1YpA9_gi.js} +1 -1
  117. package/dist/assets/{quadrantDiagram-AXDQQJYC-Dd4QQvZP.js → quadrantDiagram-AXDQQJYC-C2qTjH20.js} +1 -1
  118. package/dist/assets/{railroadDiagram-O6MQD6OU-DelSbvGO.js → railroadDiagram-O6MQD6OU-CPp8aoNp.js} +1 -1
  119. package/dist/assets/{requirementDiagram-BXWQKSXE-5-XqG4Pd.js → requirementDiagram-BXWQKSXE-CBnQ43JM.js} +1 -1
  120. package/dist/assets/{ro-RO-JPDTUUEW-ZPVCK04i.js → ro-RO-JPDTUUEW-H4uI1s8a.js} +1 -1
  121. package/dist/assets/{ru-RU-B4JR7IUQ-DMw3uqjD.js → ru-RU-B4JR7IUQ-b-lKOsBN.js} +1 -1
  122. package/dist/assets/{sankeyDiagram-P5KCCOFB-wqtLvlew.js → sankeyDiagram-P5KCCOFB-B7jZPJdS.js} +1 -1
  123. package/dist/assets/{sequenceDiagram-WJ2MYXX4-BbPB4C6s.js → sequenceDiagram-WJ2MYXX4-C99jOZ1r.js} +1 -1
  124. package/dist/assets/{si-LK-N5RQ5JYF-B6FTYzOy.js → si-LK-N5RQ5JYF-DeCygM9r.js} +1 -1
  125. package/dist/assets/{sk-SK-C5VTKIMK-L7bjhFP5.js → sk-SK-C5VTKIMK-w5xtBDKP.js} +1 -1
  126. package/dist/assets/{sl-SI-NN7IZMDC-DMRF-XT5.js → sl-SI-NN7IZMDC-CRnJ5tBv.js} +1 -1
  127. package/dist/assets/{stateDiagram-D77RDMKH-BBubDc2s.js → stateDiagram-D77RDMKH-4kLRoHWZ.js} +1 -1
  128. package/dist/assets/stateDiagram-v2-MP3YSRHH-Dqdw5DLA.js +1 -0
  129. package/dist/assets/subset-shared.chunk-Bof5vJwR.js +1 -0
  130. package/dist/assets/{subset-worker.chunk-KEidCaws.js → subset-worker.chunk-CLm540AA.js} +1 -1
  131. package/dist/assets/{sv-SE-XGPEYMSR-BzfTvinC.js → sv-SE-XGPEYMSR-f2sbJ8m0.js} +1 -1
  132. package/dist/assets/{swimlanes-42K2YHIH-DJlkpbmv.js → swimlanes-42K2YHIH-CRD2tSIe.js} +1 -1
  133. package/dist/assets/swimlanesDiagram-VR7AAH4N-CvKnw6Km.js +8 -0
  134. package/dist/assets/{ta-IN-2NMHFXQM-C8UP0lKg.js → ta-IN-2NMHFXQM-DYCA4YiO.js} +1 -1
  135. package/dist/assets/{th-TH-HPSO5L25-CixzLLgo.js → th-TH-HPSO5L25-B66Zb35O.js} +1 -1
  136. package/dist/assets/{timeline-definition-24CTP7MA-KY-J1M-z.js → timeline-definition-24CTP7MA-6by8ziM9.js} +1 -1
  137. package/dist/assets/{tr-TR-DEFEU3FU-Bmh4nYTP.js → tr-TR-DEFEU3FU-C9z8-yNP.js} +1 -1
  138. package/dist/assets/{uk-UA-QMV73CPH-ZyrvMkxR.js → uk-UA-QMV73CPH-CMZcxDuw.js} +1 -1
  139. package/dist/assets/{vennDiagram-4TSXK5OY-u-PQbWVd.js → vennDiagram-4TSXK5OY-BiAySMoC.js} +1 -1
  140. package/dist/assets/{vi-VN-M7AON7JQ-BpWez7U8.js → vi-VN-M7AON7JQ-DDvU8DIH.js} +1 -1
  141. package/dist/assets/{w3c-keyname-CtZyn8Kc.js → w3c-keyname-D6xZwL0l.js} +1 -1
  142. package/dist/assets/{wardleyDiagram-VM6X3IG4-Kl3aqJqF.js → wardleyDiagram-VM6X3IG4-CCtToYWf.js} +1 -1
  143. package/dist/assets/{window-BySVt2ir.js → window-B7hAN4Mj.js} +1 -1
  144. package/dist/assets/{xychartDiagram-S5SC5T6Z-BNfUkdAO.js → xychartDiagram-S5SC5T6Z-V8a8v8wr.js} +1 -1
  145. package/dist/assets/{zh-CN-LNUGB5OW-DxikmnaO.js → zh-CN-LNUGB5OW-BcnXkCpJ.js} +1 -1
  146. package/dist/assets/{zh-HK-E62DVLB3-D9FCYS-b.js → zh-HK-E62DVLB3-NNwGQxs1.js} +1 -1
  147. package/dist/assets/{zh-TW-RAJ6MFWO-tLoKd6py.js → zh-TW-RAJ6MFWO-WdkwNS4_.js} +1 -1
  148. package/dist/index.html +9 -9
  149. package/dist-server/index.js +180 -180
  150. package/dist-server/node_modules/better-sqlite3/README.md +1 -1
  151. package/dist-server/node_modules/better-sqlite3/binding.gyp +42 -20
  152. package/dist-server/node_modules/better-sqlite3/build/Makefile +359 -0
  153. package/dist-server/node_modules/better-sqlite3/build/Release/.deps/Release/obj.target/better_sqlite3.stamp.d +1 -0
  154. package/dist-server/node_modules/better-sqlite3/build/Release/.deps/Release/obj.target/test_extension.stamp.d +1 -0
  155. package/dist-server/node_modules/better-sqlite3/build/better_sqlite3.target.mk +18 -0
  156. package/dist-server/node_modules/better-sqlite3/build/binding.Makefile +6 -0
  157. package/dist-server/node_modules/better-sqlite3/build/test_extension.target.mk +18 -0
  158. package/dist-server/node_modules/better-sqlite3/deps/download.sh +1 -1
  159. package/dist-server/node_modules/better-sqlite3/deps/sqlite3/sqlite3.c +584 -311
  160. package/dist-server/node_modules/better-sqlite3/deps/sqlite3/sqlite3.h +9 -7
  161. package/dist-server/node_modules/better-sqlite3/lib/binding.js +62 -0
  162. package/dist-server/node_modules/better-sqlite3/lib/darwin-arm64.js +3 -0
  163. package/dist-server/node_modules/better-sqlite3/lib/darwin-x64.js +3 -0
  164. package/dist-server/node_modules/better-sqlite3/lib/database.js +90 -71
  165. package/dist-server/node_modules/better-sqlite3/lib/index.js +1 -1
  166. package/dist-server/node_modules/better-sqlite3/lib/linux-arm64.js +3 -0
  167. package/dist-server/node_modules/better-sqlite3/lib/linux-x64.js +3 -0
  168. package/dist-server/node_modules/better-sqlite3/lib/linuxmusl-arm64.js +4 -0
  169. package/dist-server/node_modules/better-sqlite3/lib/linuxmusl-x64.js +4 -0
  170. package/dist-server/node_modules/better-sqlite3/lib/methods/explain.js +9 -0
  171. package/dist-server/node_modules/better-sqlite3/lib/methods/pragma.js +1 -1
  172. package/dist-server/node_modules/better-sqlite3/lib/methods/table.js +8 -2
  173. package/dist-server/node_modules/better-sqlite3/lib/methods/transaction.js +9 -9
  174. package/dist-server/node_modules/better-sqlite3/lib/methods/wrappers.js +1 -1
  175. package/dist-server/node_modules/better-sqlite3/lib/sqlite-error.js +20 -15
  176. package/dist-server/node_modules/better-sqlite3/lib/win32-arm64.js +3 -0
  177. package/dist-server/node_modules/better-sqlite3/lib/win32-x64.js +3 -0
  178. package/dist-server/node_modules/{mimic-response/license → better-sqlite3/node_modules/node-addon-api/LICENSE.md} +2 -2
  179. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/README.md +95 -0
  180. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/common.gypi +21 -0
  181. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/except.gypi +25 -0
  182. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/index.js +14 -0
  183. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/napi-inl.deprecated.h +186 -0
  184. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/napi-inl.h +7250 -0
  185. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/napi.h +3463 -0
  186. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/node_addon_api.gyp +42 -0
  187. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/node_api.gyp +9 -0
  188. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/noexcept.gypi +26 -0
  189. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/package-support.json +21 -0
  190. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/package.json +481 -0
  191. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/tools/README.md +73 -0
  192. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/tools/check-napi.js +99 -0
  193. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/tools/clang-format.js +71 -0
  194. package/dist-server/node_modules/better-sqlite3/node_modules/node-addon-api/tools/conversion.js +301 -0
  195. package/dist-server/node_modules/better-sqlite3/package.json +23 -15
  196. package/dist-server/node_modules/better-sqlite3/prebuilds/darwin-arm64.node +0 -0
  197. package/dist-server/node_modules/better-sqlite3/prebuilds/darwin-x64.node +0 -0
  198. package/dist-server/node_modules/better-sqlite3/prebuilds/linux-arm64.node +0 -0
  199. package/dist-server/node_modules/better-sqlite3/prebuilds/linux-x64.node +0 -0
  200. package/dist-server/node_modules/better-sqlite3/prebuilds/linuxmusl-arm64.node +0 -0
  201. package/dist-server/node_modules/better-sqlite3/prebuilds/linuxmusl-x64.node +0 -0
  202. package/dist-server/node_modules/better-sqlite3/prebuilds/win32-arm64.node +0 -0
  203. package/dist-server/node_modules/better-sqlite3/prebuilds/win32-x64.node +0 -0
  204. package/dist-server/node_modules/better-sqlite3/src/addon.cpp +23 -11
  205. package/dist-server/node_modules/better-sqlite3/src/better_sqlite3.cpp +26 -27
  206. package/dist-server/node_modules/better-sqlite3/src/objects/backup.cpp +51 -50
  207. package/dist-server/node_modules/better-sqlite3/src/objects/backup.hpp +10 -14
  208. package/dist-server/node_modules/better-sqlite3/src/objects/database.cpp +157 -142
  209. package/dist-server/node_modules/better-sqlite3/src/objects/database.hpp +15 -18
  210. package/dist-server/node_modules/better-sqlite3/src/objects/statement-iterator.cpp +58 -52
  211. package/dist-server/node_modules/better-sqlite3/src/objects/statement-iterator.hpp +44 -23
  212. package/dist-server/node_modules/better-sqlite3/src/objects/statement.cpp +182 -185
  213. package/dist-server/node_modules/better-sqlite3/src/objects/statement.hpp +23 -16
  214. package/dist-server/node_modules/better-sqlite3/src/util/bind-map.cpp +12 -12
  215. package/dist-server/node_modules/better-sqlite3/src/util/binder.cpp +73 -56
  216. package/dist-server/node_modules/better-sqlite3/src/util/constants.cpp +154 -154
  217. package/dist-server/node_modules/better-sqlite3/src/util/custom-aggregate.cpp +33 -33
  218. package/dist-server/node_modules/better-sqlite3/src/util/custom-function.cpp +13 -13
  219. package/dist-server/node_modules/better-sqlite3/src/util/custom-table.cpp +59 -62
  220. package/dist-server/node_modules/better-sqlite3/src/util/data-converter.cpp +3 -3
  221. package/dist-server/node_modules/better-sqlite3/src/util/data.cpp +56 -116
  222. package/dist-server/node_modules/better-sqlite3/src/util/helpers.cpp +165 -84
  223. package/dist-server/node_modules/better-sqlite3/src/util/macros.cpp +32 -48
  224. package/dist-server/node_modules/better-sqlite3/src/util/query-macros.cpp +12 -12
  225. package/dist-server/node_modules/better-sqlite3/src/util/row-builder.cpp +47 -43
  226. package/dist-server/node_modules/better-sqlite3/src/util/row-builder.hpp +22 -0
  227. package/dist-server/node_modules/{strip-json-comments/license → node-addon-api/LICENSE.md} +2 -2
  228. package/dist-server/node_modules/node-addon-api/README.md +319 -0
  229. package/dist-server/node_modules/node-addon-api/common.gypi +20 -0
  230. package/dist-server/node_modules/node-addon-api/except.gypi +25 -0
  231. package/dist-server/node_modules/node-addon-api/index.js +12 -0
  232. package/dist-server/node_modules/node-addon-api/napi-inl.deprecated.h +186 -0
  233. package/dist-server/node_modules/node-addon-api/napi-inl.h +6607 -0
  234. package/dist-server/node_modules/node-addon-api/napi.h +3201 -0
  235. package/dist-server/node_modules/node-addon-api/node_addon_api.gyp +32 -0
  236. package/dist-server/node_modules/node-addon-api/node_api.gyp +9 -0
  237. package/dist-server/node_modules/node-addon-api/noexcept.gypi +26 -0
  238. package/dist-server/node_modules/node-addon-api/package-support.json +21 -0
  239. package/dist-server/node_modules/node-addon-api/package.json +480 -0
  240. package/dist-server/node_modules/node-addon-api/tools/README.md +73 -0
  241. package/dist-server/node_modules/node-addon-api/tools/check-napi.js +99 -0
  242. package/dist-server/node_modules/node-addon-api/tools/clang-format.js +71 -0
  243. package/dist-server/node_modules/node-addon-api/tools/conversion.js +301 -0
  244. package/dist-server/node_modules/node-addon-api/tools/eslint-format.js +79 -0
  245. package/package.json +2 -2
  246. package/src/cli.mjs +2 -2
  247. package/dist/assets/WorkspaceProvider-DKcEBrbi.js +0 -73
  248. package/dist/assets/channel-C0ODVPHj.js +0 -1
  249. package/dist/assets/classDiagram-ZZMXUADV-C4l4kxOm.js +0 -1
  250. package/dist/assets/classDiagram-v2-VYDZK3BY-C4l4kxOm.js +0 -1
  251. package/dist/assets/core-DNaw6KYU.js +0 -1
  252. package/dist/assets/dist-js-C7JaR3Vq.js +0 -1
  253. package/dist/assets/dist-js-CoMyUP6l.js +0 -1
  254. package/dist/assets/flowDiagram-HODETNUW-DJYVDdQC.js +0 -1
  255. package/dist/assets/image-DXXwzuA0.js +0 -1
  256. package/dist/assets/index-BIdmbUBb.css +0 -1
  257. package/dist/assets/percentages-BXMCSKIN-C-szEgW9.js +0 -1
  258. package/dist/assets/stateDiagram-v2-MP3YSRHH-alH7VHsd.js +0 -1
  259. package/dist/assets/subset-shared.chunk-B-Ym10WO.js +0 -1
  260. package/dist/assets/swimlanesDiagram-VR7AAH4N-Cx5YcCnA.js +0 -8
  261. package/dist-server/node_modules/base64-js/LICENSE +0 -21
  262. package/dist-server/node_modules/base64-js/README.md +0 -34
  263. package/dist-server/node_modules/base64-js/base64js.min.js +0 -1
  264. package/dist-server/node_modules/base64-js/index.d.ts +0 -3
  265. package/dist-server/node_modules/base64-js/index.js +0 -150
  266. package/dist-server/node_modules/base64-js/package.json +0 -47
  267. package/dist-server/node_modules/better-sqlite3/build/Release/better_sqlite3.node +0 -0
  268. package/dist-server/node_modules/bindings/LICENSE.md +0 -22
  269. package/dist-server/node_modules/bindings/README.md +0 -98
  270. package/dist-server/node_modules/bindings/bindings.js +0 -221
  271. package/dist-server/node_modules/bindings/package.json +0 -28
  272. package/dist-server/node_modules/bl/BufferList.js +0 -396
  273. package/dist-server/node_modules/bl/LICENSE.md +0 -13
  274. package/dist-server/node_modules/bl/README.md +0 -247
  275. package/dist-server/node_modules/bl/bl.js +0 -84
  276. package/dist-server/node_modules/bl/package.json +0 -37
  277. package/dist-server/node_modules/bl/test/convert.js +0 -21
  278. package/dist-server/node_modules/bl/test/indexOf.js +0 -492
  279. package/dist-server/node_modules/bl/test/isBufferList.js +0 -32
  280. package/dist-server/node_modules/bl/test/test.js +0 -869
  281. package/dist-server/node_modules/buffer/AUTHORS.md +0 -70
  282. package/dist-server/node_modules/buffer/LICENSE +0 -21
  283. package/dist-server/node_modules/buffer/README.md +0 -410
  284. package/dist-server/node_modules/buffer/index.d.ts +0 -186
  285. package/dist-server/node_modules/buffer/index.js +0 -1817
  286. package/dist-server/node_modules/buffer/package.json +0 -96
  287. package/dist-server/node_modules/chownr/LICENSE +0 -15
  288. package/dist-server/node_modules/chownr/README.md +0 -3
  289. package/dist-server/node_modules/chownr/chownr.js +0 -167
  290. package/dist-server/node_modules/chownr/package.json +0 -29
  291. package/dist-server/node_modules/decompress-response/index.d.ts +0 -22
  292. package/dist-server/node_modules/decompress-response/index.js +0 -58
  293. package/dist-server/node_modules/decompress-response/license +0 -9
  294. package/dist-server/node_modules/decompress-response/package.json +0 -56
  295. package/dist-server/node_modules/decompress-response/readme.md +0 -48
  296. package/dist-server/node_modules/deep-extend/CHANGELOG.md +0 -46
  297. package/dist-server/node_modules/deep-extend/LICENSE +0 -20
  298. package/dist-server/node_modules/deep-extend/README.md +0 -91
  299. package/dist-server/node_modules/deep-extend/index.js +0 -1
  300. package/dist-server/node_modules/deep-extend/lib/deep-extend.js +0 -150
  301. package/dist-server/node_modules/deep-extend/package.json +0 -62
  302. package/dist-server/node_modules/detect-libc/LICENSE +0 -201
  303. package/dist-server/node_modules/detect-libc/README.md +0 -163
  304. package/dist-server/node_modules/detect-libc/index.d.ts +0 -14
  305. package/dist-server/node_modules/detect-libc/lib/detect-libc.js +0 -313
  306. package/dist-server/node_modules/detect-libc/lib/elf.js +0 -39
  307. package/dist-server/node_modules/detect-libc/lib/filesystem.js +0 -51
  308. package/dist-server/node_modules/detect-libc/lib/process.js +0 -24
  309. package/dist-server/node_modules/detect-libc/package.json +0 -44
  310. package/dist-server/node_modules/end-of-stream/LICENSE +0 -21
  311. package/dist-server/node_modules/end-of-stream/README.md +0 -54
  312. package/dist-server/node_modules/end-of-stream/index.js +0 -96
  313. package/dist-server/node_modules/end-of-stream/package.json +0 -37
  314. package/dist-server/node_modules/expand-template/LICENSE +0 -21
  315. package/dist-server/node_modules/expand-template/README.md +0 -43
  316. package/dist-server/node_modules/expand-template/index.js +0 -26
  317. package/dist-server/node_modules/expand-template/package.json +0 -29
  318. package/dist-server/node_modules/expand-template/test.js +0 -67
  319. package/dist-server/node_modules/file-uri-to-path/History.md +0 -21
  320. package/dist-server/node_modules/file-uri-to-path/LICENSE +0 -20
  321. package/dist-server/node_modules/file-uri-to-path/README.md +0 -74
  322. package/dist-server/node_modules/file-uri-to-path/index.d.ts +0 -2
  323. package/dist-server/node_modules/file-uri-to-path/index.js +0 -66
  324. package/dist-server/node_modules/file-uri-to-path/package.json +0 -32
  325. package/dist-server/node_modules/file-uri-to-path/test/test.js +0 -24
  326. package/dist-server/node_modules/file-uri-to-path/test/tests.json +0 -13
  327. package/dist-server/node_modules/fs-constants/LICENSE +0 -21
  328. package/dist-server/node_modules/fs-constants/README.md +0 -26
  329. package/dist-server/node_modules/fs-constants/browser.js +0 -1
  330. package/dist-server/node_modules/fs-constants/index.js +0 -1
  331. package/dist-server/node_modules/fs-constants/package.json +0 -19
  332. package/dist-server/node_modules/github-from-package/LICENSE +0 -18
  333. package/dist-server/node_modules/github-from-package/example/package.json +0 -8
  334. package/dist-server/node_modules/github-from-package/example/url.js +0 -3
  335. package/dist-server/node_modules/github-from-package/index.js +0 -17
  336. package/dist-server/node_modules/github-from-package/package.json +0 -30
  337. package/dist-server/node_modules/github-from-package/readme.markdown +0 -53
  338. package/dist-server/node_modules/github-from-package/test/a.json +0 -8
  339. package/dist-server/node_modules/github-from-package/test/b.json +0 -5
  340. package/dist-server/node_modules/github-from-package/test/c.json +0 -5
  341. package/dist-server/node_modules/github-from-package/test/d.json +0 -7
  342. package/dist-server/node_modules/github-from-package/test/e.json +0 -5
  343. package/dist-server/node_modules/github-from-package/test/url.js +0 -19
  344. package/dist-server/node_modules/ieee754/LICENSE +0 -11
  345. package/dist-server/node_modules/ieee754/README.md +0 -51
  346. package/dist-server/node_modules/ieee754/index.d.ts +0 -10
  347. package/dist-server/node_modules/ieee754/index.js +0 -85
  348. package/dist-server/node_modules/ieee754/package.json +0 -52
  349. package/dist-server/node_modules/inherits/LICENSE +0 -16
  350. package/dist-server/node_modules/inherits/README.md +0 -42
  351. package/dist-server/node_modules/inherits/inherits.js +0 -9
  352. package/dist-server/node_modules/inherits/inherits_browser.js +0 -27
  353. package/dist-server/node_modules/inherits/package.json +0 -29
  354. package/dist-server/node_modules/ini/LICENSE +0 -15
  355. package/dist-server/node_modules/ini/README.md +0 -102
  356. package/dist-server/node_modules/ini/ini.js +0 -206
  357. package/dist-server/node_modules/ini/package.json +0 -33
  358. package/dist-server/node_modules/mimic-response/index.d.ts +0 -17
  359. package/dist-server/node_modules/mimic-response/index.js +0 -77
  360. package/dist-server/node_modules/mimic-response/package.json +0 -42
  361. package/dist-server/node_modules/mimic-response/readme.md +0 -78
  362. package/dist-server/node_modules/minimist/CHANGELOG.md +0 -298
  363. package/dist-server/node_modules/minimist/LICENSE +0 -18
  364. package/dist-server/node_modules/minimist/README.md +0 -121
  365. package/dist-server/node_modules/minimist/example/parse.js +0 -4
  366. package/dist-server/node_modules/minimist/index.js +0 -263
  367. package/dist-server/node_modules/minimist/package.json +0 -75
  368. package/dist-server/node_modules/minimist/test/all_bool.js +0 -34
  369. package/dist-server/node_modules/minimist/test/bool.js +0 -177
  370. package/dist-server/node_modules/minimist/test/dash.js +0 -43
  371. package/dist-server/node_modules/minimist/test/default_bool.js +0 -37
  372. package/dist-server/node_modules/minimist/test/dotted.js +0 -24
  373. package/dist-server/node_modules/minimist/test/kv_short.js +0 -32
  374. package/dist-server/node_modules/minimist/test/long.js +0 -33
  375. package/dist-server/node_modules/minimist/test/num.js +0 -38
  376. package/dist-server/node_modules/minimist/test/parse.js +0 -209
  377. package/dist-server/node_modules/minimist/test/parse_modified.js +0 -11
  378. package/dist-server/node_modules/minimist/test/proto.js +0 -64
  379. package/dist-server/node_modules/minimist/test/short.js +0 -69
  380. package/dist-server/node_modules/minimist/test/stop_early.js +0 -17
  381. package/dist-server/node_modules/minimist/test/unknown.js +0 -104
  382. package/dist-server/node_modules/minimist/test/whitespace.js +0 -10
  383. package/dist-server/node_modules/mkdirp-classic/LICENSE +0 -21
  384. package/dist-server/node_modules/mkdirp-classic/README.md +0 -18
  385. package/dist-server/node_modules/mkdirp-classic/index.js +0 -98
  386. package/dist-server/node_modules/mkdirp-classic/package.json +0 -18
  387. package/dist-server/node_modules/napi-build-utils/LICENSE +0 -21
  388. package/dist-server/node_modules/napi-build-utils/README.md +0 -52
  389. package/dist-server/node_modules/napi-build-utils/index.js +0 -214
  390. package/dist-server/node_modules/napi-build-utils/package.json +0 -42
  391. package/dist-server/node_modules/node-abi/LICENSE +0 -21
  392. package/dist-server/node_modules/node-abi/README.md +0 -54
  393. package/dist-server/node_modules/node-abi/abi_registry.json +0 -446
  394. package/dist-server/node_modules/node-abi/index.js +0 -179
  395. package/dist-server/node_modules/node-abi/node_modules/semver/LICENSE +0 -15
  396. package/dist-server/node_modules/node-abi/node_modules/semver/README.md +0 -680
  397. package/dist-server/node_modules/node-abi/node_modules/semver/bin/semver.js +0 -195
  398. package/dist-server/node_modules/node-abi/node_modules/semver/classes/comparator.js +0 -143
  399. package/dist-server/node_modules/node-abi/node_modules/semver/classes/index.js +0 -7
  400. package/dist-server/node_modules/node-abi/node_modules/semver/classes/range.js +0 -564
  401. package/dist-server/node_modules/node-abi/node_modules/semver/classes/semver.js +0 -333
  402. package/dist-server/node_modules/node-abi/node_modules/semver/functions/clean.js +0 -8
  403. package/dist-server/node_modules/node-abi/node_modules/semver/functions/cmp.js +0 -54
  404. package/dist-server/node_modules/node-abi/node_modules/semver/functions/coerce.js +0 -62
  405. package/dist-server/node_modules/node-abi/node_modules/semver/functions/compare-build.js +0 -9
  406. package/dist-server/node_modules/node-abi/node_modules/semver/functions/compare-loose.js +0 -5
  407. package/dist-server/node_modules/node-abi/node_modules/semver/functions/compare.js +0 -7
  408. package/dist-server/node_modules/node-abi/node_modules/semver/functions/diff.js +0 -60
  409. package/dist-server/node_modules/node-abi/node_modules/semver/functions/eq.js +0 -5
  410. package/dist-server/node_modules/node-abi/node_modules/semver/functions/gt.js +0 -5
  411. package/dist-server/node_modules/node-abi/node_modules/semver/functions/gte.js +0 -5
  412. package/dist-server/node_modules/node-abi/node_modules/semver/functions/inc.js +0 -21
  413. package/dist-server/node_modules/node-abi/node_modules/semver/functions/lt.js +0 -5
  414. package/dist-server/node_modules/node-abi/node_modules/semver/functions/lte.js +0 -5
  415. package/dist-server/node_modules/node-abi/node_modules/semver/functions/major.js +0 -5
  416. package/dist-server/node_modules/node-abi/node_modules/semver/functions/minor.js +0 -5
  417. package/dist-server/node_modules/node-abi/node_modules/semver/functions/neq.js +0 -5
  418. package/dist-server/node_modules/node-abi/node_modules/semver/functions/parse.js +0 -18
  419. package/dist-server/node_modules/node-abi/node_modules/semver/functions/patch.js +0 -5
  420. package/dist-server/node_modules/node-abi/node_modules/semver/functions/prerelease.js +0 -8
  421. package/dist-server/node_modules/node-abi/node_modules/semver/functions/rcompare.js +0 -5
  422. package/dist-server/node_modules/node-abi/node_modules/semver/functions/rsort.js +0 -5
  423. package/dist-server/node_modules/node-abi/node_modules/semver/functions/satisfies.js +0 -12
  424. package/dist-server/node_modules/node-abi/node_modules/semver/functions/sort.js +0 -5
  425. package/dist-server/node_modules/node-abi/node_modules/semver/functions/truncate.js +0 -48
  426. package/dist-server/node_modules/node-abi/node_modules/semver/functions/valid.js +0 -8
  427. package/dist-server/node_modules/node-abi/node_modules/semver/index.js +0 -93
  428. package/dist-server/node_modules/node-abi/node_modules/semver/internal/constants.js +0 -37
  429. package/dist-server/node_modules/node-abi/node_modules/semver/internal/debug.js +0 -11
  430. package/dist-server/node_modules/node-abi/node_modules/semver/internal/identifiers.js +0 -29
  431. package/dist-server/node_modules/node-abi/node_modules/semver/internal/lrucache.js +0 -42
  432. package/dist-server/node_modules/node-abi/node_modules/semver/internal/parse-options.js +0 -17
  433. package/dist-server/node_modules/node-abi/node_modules/semver/internal/re.js +0 -223
  434. package/dist-server/node_modules/node-abi/node_modules/semver/package.json +0 -78
  435. package/dist-server/node_modules/node-abi/node_modules/semver/preload.js +0 -4
  436. package/dist-server/node_modules/node-abi/node_modules/semver/range.bnf +0 -17
  437. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/gtr.js +0 -6
  438. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/intersects.js +0 -9
  439. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/ltr.js +0 -6
  440. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/max-satisfying.js +0 -27
  441. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/min-satisfying.js +0 -26
  442. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/min-version.js +0 -63
  443. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/outside.js +0 -82
  444. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/simplify.js +0 -49
  445. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/subset.js +0 -249
  446. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/to-comparators.js +0 -10
  447. package/dist-server/node_modules/node-abi/node_modules/semver/ranges/valid.js +0 -13
  448. package/dist-server/node_modules/node-abi/package.json +0 -45
  449. package/dist-server/node_modules/once/LICENSE +0 -15
  450. package/dist-server/node_modules/once/README.md +0 -79
  451. package/dist-server/node_modules/once/once.js +0 -42
  452. package/dist-server/node_modules/once/package.json +0 -33
  453. package/dist-server/node_modules/prebuild-install/CHANGELOG.md +0 -131
  454. package/dist-server/node_modules/prebuild-install/CONTRIBUTING.md +0 -6
  455. package/dist-server/node_modules/prebuild-install/LICENSE +0 -21
  456. package/dist-server/node_modules/prebuild-install/README.md +0 -163
  457. package/dist-server/node_modules/prebuild-install/asset.js +0 -44
  458. package/dist-server/node_modules/prebuild-install/bin.js +0 -78
  459. package/dist-server/node_modules/prebuild-install/download.js +0 -142
  460. package/dist-server/node_modules/prebuild-install/error.js +0 -14
  461. package/dist-server/node_modules/prebuild-install/help.txt +0 -16
  462. package/dist-server/node_modules/prebuild-install/index.js +0 -1
  463. package/dist-server/node_modules/prebuild-install/log.js +0 -33
  464. package/dist-server/node_modules/prebuild-install/package.json +0 -67
  465. package/dist-server/node_modules/prebuild-install/proxy.js +0 -35
  466. package/dist-server/node_modules/prebuild-install/rc.js +0 -64
  467. package/dist-server/node_modules/prebuild-install/util.js +0 -143
  468. package/dist-server/node_modules/pump/LICENSE +0 -21
  469. package/dist-server/node_modules/pump/README.md +0 -74
  470. package/dist-server/node_modules/pump/SECURITY.md +0 -5
  471. package/dist-server/node_modules/pump/empty.js +0 -1
  472. package/dist-server/node_modules/pump/index.js +0 -86
  473. package/dist-server/node_modules/pump/package.json +0 -30
  474. package/dist-server/node_modules/pump/test-browser.js +0 -66
  475. package/dist-server/node_modules/pump/test-node.js +0 -53
  476. package/dist-server/node_modules/rc/LICENSE.APACHE2 +0 -15
  477. package/dist-server/node_modules/rc/LICENSE.BSD +0 -26
  478. package/dist-server/node_modules/rc/LICENSE.MIT +0 -24
  479. package/dist-server/node_modules/rc/README.md +0 -227
  480. package/dist-server/node_modules/rc/browser.js +0 -7
  481. package/dist-server/node_modules/rc/cli.js +0 -4
  482. package/dist-server/node_modules/rc/index.js +0 -53
  483. package/dist-server/node_modules/rc/lib/utils.js +0 -104
  484. package/dist-server/node_modules/rc/node_modules/strip-json-comments/index.js +0 -70
  485. package/dist-server/node_modules/rc/node_modules/strip-json-comments/license +0 -21
  486. package/dist-server/node_modules/rc/node_modules/strip-json-comments/package.json +0 -42
  487. package/dist-server/node_modules/rc/node_modules/strip-json-comments/readme.md +0 -64
  488. package/dist-server/node_modules/rc/package.json +0 -29
  489. package/dist-server/node_modules/rc/test/ini.js +0 -16
  490. package/dist-server/node_modules/rc/test/nested-env-vars.js +0 -50
  491. package/dist-server/node_modules/rc/test/test.js +0 -59
  492. package/dist-server/node_modules/readable-stream/CONTRIBUTING.md +0 -38
  493. package/dist-server/node_modules/readable-stream/GOVERNANCE.md +0 -136
  494. package/dist-server/node_modules/readable-stream/LICENSE +0 -47
  495. package/dist-server/node_modules/readable-stream/README.md +0 -106
  496. package/dist-server/node_modules/readable-stream/errors-browser.js +0 -127
  497. package/dist-server/node_modules/readable-stream/errors.js +0 -116
  498. package/dist-server/node_modules/readable-stream/experimentalWarning.js +0 -17
  499. package/dist-server/node_modules/readable-stream/lib/_stream_duplex.js +0 -126
  500. package/dist-server/node_modules/readable-stream/lib/_stream_passthrough.js +0 -37
  501. package/dist-server/node_modules/readable-stream/lib/_stream_readable.js +0 -1027
  502. package/dist-server/node_modules/readable-stream/lib/_stream_transform.js +0 -190
  503. package/dist-server/node_modules/readable-stream/lib/_stream_writable.js +0 -641
  504. package/dist-server/node_modules/readable-stream/lib/internal/streams/async_iterator.js +0 -180
  505. package/dist-server/node_modules/readable-stream/lib/internal/streams/buffer_list.js +0 -183
  506. package/dist-server/node_modules/readable-stream/lib/internal/streams/destroy.js +0 -96
  507. package/dist-server/node_modules/readable-stream/lib/internal/streams/end-of-stream.js +0 -86
  508. package/dist-server/node_modules/readable-stream/lib/internal/streams/from-browser.js +0 -3
  509. package/dist-server/node_modules/readable-stream/lib/internal/streams/from.js +0 -52
  510. package/dist-server/node_modules/readable-stream/lib/internal/streams/pipeline.js +0 -86
  511. package/dist-server/node_modules/readable-stream/lib/internal/streams/state.js +0 -22
  512. package/dist-server/node_modules/readable-stream/lib/internal/streams/stream-browser.js +0 -1
  513. package/dist-server/node_modules/readable-stream/lib/internal/streams/stream.js +0 -1
  514. package/dist-server/node_modules/readable-stream/package.json +0 -68
  515. package/dist-server/node_modules/readable-stream/readable-browser.js +0 -9
  516. package/dist-server/node_modules/readable-stream/readable.js +0 -16
  517. package/dist-server/node_modules/safe-buffer/LICENSE +0 -21
  518. package/dist-server/node_modules/safe-buffer/README.md +0 -584
  519. package/dist-server/node_modules/safe-buffer/index.d.ts +0 -187
  520. package/dist-server/node_modules/safe-buffer/index.js +0 -65
  521. package/dist-server/node_modules/safe-buffer/package.json +0 -51
  522. package/dist-server/node_modules/semver/LICENSE +0 -15
  523. package/dist-server/node_modules/semver/README.md +0 -443
  524. package/dist-server/node_modules/semver/bin/semver.js +0 -174
  525. package/dist-server/node_modules/semver/package.json +0 -38
  526. package/dist-server/node_modules/semver/range.bnf +0 -16
  527. package/dist-server/node_modules/semver/semver.js +0 -1643
  528. package/dist-server/node_modules/simple-concat/LICENSE +0 -20
  529. package/dist-server/node_modules/simple-concat/README.md +0 -44
  530. package/dist-server/node_modules/simple-concat/index.js +0 -15
  531. package/dist-server/node_modules/simple-concat/package.json +0 -47
  532. package/dist-server/node_modules/simple-concat/test/basic.js +0 -41
  533. package/dist-server/node_modules/simple-get/LICENSE +0 -20
  534. package/dist-server/node_modules/simple-get/README.md +0 -333
  535. package/dist-server/node_modules/simple-get/index.js +0 -108
  536. package/dist-server/node_modules/simple-get/package.json +0 -67
  537. package/dist-server/node_modules/string_decoder/LICENSE +0 -48
  538. package/dist-server/node_modules/string_decoder/README.md +0 -47
  539. package/dist-server/node_modules/string_decoder/lib/string_decoder.js +0 -296
  540. package/dist-server/node_modules/string_decoder/package.json +0 -34
  541. package/dist-server/node_modules/strip-json-comments/index.d.ts +0 -41
  542. package/dist-server/node_modules/strip-json-comments/index.js +0 -113
  543. package/dist-server/node_modules/strip-json-comments/package.json +0 -56
  544. package/dist-server/node_modules/strip-json-comments/readme.md +0 -75
  545. package/dist-server/node_modules/tar-fs/LICENSE +0 -21
  546. package/dist-server/node_modules/tar-fs/README.md +0 -165
  547. package/dist-server/node_modules/tar-fs/index.js +0 -363
  548. package/dist-server/node_modules/tar-fs/package.json +0 -41
  549. package/dist-server/node_modules/tar-fs/test/fixtures/a/hello.txt +0 -1
  550. package/dist-server/node_modules/tar-fs/test/fixtures/b/a/test.txt +0 -1
  551. package/dist-server/node_modules/tar-fs/test/fixtures/d/sub-files/file3 +0 -0
  552. package/dist-server/node_modules/tar-fs/test/fixtures/d/sub-files/file4 +0 -0
  553. package/dist-server/node_modules/tar-fs/test/fixtures/e/file +0 -0
  554. package/dist-server/node_modules/tar-fs/test/fixtures/invalid.tar +0 -0
  555. package/dist-server/node_modules/tar-fs/test/index.js +0 -346
  556. package/dist-server/node_modules/tar-stream/LICENSE +0 -21
  557. package/dist-server/node_modules/tar-stream/README.md +0 -168
  558. package/dist-server/node_modules/tar-stream/extract.js +0 -257
  559. package/dist-server/node_modules/tar-stream/headers.js +0 -295
  560. package/dist-server/node_modules/tar-stream/index.js +0 -2
  561. package/dist-server/node_modules/tar-stream/pack.js +0 -255
  562. package/dist-server/node_modules/tar-stream/package.json +0 -58
  563. package/dist-server/node_modules/tar-stream/sandbox.js +0 -11
  564. package/dist-server/node_modules/tunnel-agent/LICENSE +0 -55
  565. package/dist-server/node_modules/tunnel-agent/README.md +0 -4
  566. package/dist-server/node_modules/tunnel-agent/index.js +0 -244
  567. package/dist-server/node_modules/tunnel-agent/package.json +0 -22
  568. package/dist-server/node_modules/util-deprecate/History.md +0 -16
  569. package/dist-server/node_modules/util-deprecate/LICENSE +0 -24
  570. package/dist-server/node_modules/util-deprecate/README.md +0 -53
  571. package/dist-server/node_modules/util-deprecate/browser.js +0 -67
  572. package/dist-server/node_modules/util-deprecate/node.js +0 -6
  573. package/dist-server/node_modules/util-deprecate/package.json +0 -27
  574. package/dist-server/node_modules/wrappy/LICENSE +0 -15
  575. package/dist-server/node_modules/wrappy/README.md +0 -36
  576. package/dist-server/node_modules/wrappy/package.json +0 -29
  577. package/dist-server/node_modules/wrappy/wrappy.js +0 -33
  578. /package/dist-server/node_modules/{napi-build-utils/index.md → better-sqlite3/build/Release/obj.target/better_sqlite3.stamp} +0 -0
  579. /package/dist-server/node_modules/{tar-fs/test/fixtures/d/file1 → better-sqlite3/build/Release/obj.target/test_extension.stamp} +0 -0
  580. /package/dist-server/node_modules/{tar-fs/test/fixtures/d/file2 → better-sqlite3/node_modules/node-addon-api/nothing.c} +0 -0
  581. /package/dist-server/node_modules/{tar-fs/test/fixtures/d/sub-dir/file5 → node-addon-api/nothing.c} +0 -0
@@ -1,6 +1,6 @@
1
1
  /******************************************************************************
2
2
  ** This file is an amalgamation of many separate C source files from SQLite
3
- ** version 3.53.2. By combining all the individual C code files into this
3
+ ** version 3.53.4. By combining all the individual C code files into this
4
4
  ** single large file, the entire code can be compiled as a single translation
5
5
  ** unit. This allows many compilers to do optimizations that would not be
6
6
  ** possible if the files were compiled separately. Performance improvements
@@ -18,7 +18,7 @@
18
18
  ** separate file. This file contains only code for the core SQLite library.
19
19
  **
20
20
  ** The content in this amalgamation comes from Fossil check-in
21
- ** d6e03d8c777cfa2d35e3b60d8ec3e0187f3e with changes in files:
21
+ ** bf7c7f30031888f4e796e429ab3978879485 with changes in files:
22
22
  **
23
23
  **
24
24
  */
@@ -468,12 +468,12 @@ extern "C" {
468
468
  ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
469
469
  ** [sqlite_version()] and [sqlite_source_id()].
470
470
  */
471
- #define SQLITE_VERSION "3.53.2"
472
- #define SQLITE_VERSION_NUMBER 3053002
473
- #define SQLITE_SOURCE_ID "2026-06-03 19:12:13 d6e03d8c777cfa2d35e3b60d8ec3e0187f3e9f99d8e2ee9cac695fd6fcdf1a24"
471
+ #define SQLITE_VERSION "3.53.4"
472
+ #define SQLITE_VERSION_NUMBER 3053004
473
+ #define SQLITE_SOURCE_ID "2026-07-24 19:02:57 bf7c7f30031888f4e796e429ab3978879485813aaca6f641c7b33e4e09459bcc"
474
474
  #define SQLITE_SCM_BRANCH "branch-3.53"
475
- #define SQLITE_SCM_TAGS "release version-3.53.2"
476
- #define SQLITE_SCM_DATETIME "2026-06-03T19:12:13.350Z"
475
+ #define SQLITE_SCM_TAGS "release version-3.53.4"
476
+ #define SQLITE_SCM_DATETIME "2026-07-24T19:02:57.525Z"
477
477
 
478
478
  /*
479
479
  ** CAPI3REF: Run-Time Library Version Numbers
@@ -4688,7 +4688,8 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
4688
4688
  ** or in an ORDER BY or GROUP BY clause.</dd>)^
4689
4689
  **
4690
4690
  ** [[SQLITE_LIMIT_EXPR_DEPTH]] ^(<dt>SQLITE_LIMIT_EXPR_DEPTH</dt>
4691
- ** <dd>The maximum depth of the parse tree on any expression.</dd>)^
4691
+ ** <dd>The maximum depth of the parse tree on any expression and
4692
+ ** the maximum nesting depth for subqueries and VIEWs</dd>)^
4692
4693
  **
4693
4694
  ** [[SQLITE_LIMIT_PARSER_DEPTH]] ^(<dt>SQLITE_LIMIT_PARSER_DEPTH</dt>
4694
4695
  ** <dd>The maximum depth of the LALR(1) parser stack used to analyze
@@ -4719,7 +4720,8 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
4719
4720
  ** <dd>The maximum index number of any [parameter] in an SQL statement.)^
4720
4721
  **
4721
4722
  ** [[SQLITE_LIMIT_TRIGGER_DEPTH]] ^(<dt>SQLITE_LIMIT_TRIGGER_DEPTH</dt>
4722
- ** <dd>The maximum depth of recursion for triggers.</dd>)^
4723
+ ** <dd>The maximum depth of recursion for triggers, and the maximum
4724
+ ** nesting depth for separate triggers.</dd>)^
4723
4725
  **
4724
4726
  ** [[SQLITE_LIMIT_WORKER_THREADS]] ^(<dt>SQLITE_LIMIT_WORKER_THREADS</dt>
4725
4727
  ** <dd>The maximum number of auxiliary worker threads that a single
@@ -15801,6 +15803,13 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);
15801
15803
  # define offsetof(ST,M) ((size_t)((char*)&((ST*)0)->M - (char*)0))
15802
15804
  #endif
15803
15805
 
15806
+ /*
15807
+ ** sizeof64() is like sizeof(), but always returns a 64-bit value, even
15808
+ ** on 32-bit builds. This can help to avoid overflow by ensuring 64-bit
15809
+ ** arithmetic is used consistently in both 32-bit and 64-bit builds.
15810
+ */
15811
+ #define sizeof64(X) ((sqlite3_int64)sizeof(X))
15812
+
15804
15813
  /*
15805
15814
  ** Work around C99 "flex-array" syntax for pre-C99 compilers, so as
15806
15815
  ** to avoid complaints from -fsanitize=strict-bounds.
@@ -17162,7 +17171,7 @@ SQLITE_PRIVATE int sqlite3BtreeCheckpoint(Btree*, int, int *, int *);
17162
17171
 
17163
17172
  SQLITE_PRIVATE const char *sqlite3BtreeGetFilename(Btree *);
17164
17173
  SQLITE_PRIVATE const char *sqlite3BtreeGetJournalname(Btree *);
17165
- SQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree *, Btree *);
17174
+ SQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree*, Btree*);
17166
17175
 
17167
17176
  SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *);
17168
17177
 
@@ -20920,6 +20929,7 @@ struct Parse {
20920
20929
  int szOpAlloc; /* Bytes of memory space allocated for Vdbe.aOp[] */
20921
20930
  int iSelfTab; /* Table associated with an index on expr, or negative
20922
20931
  ** of the base register during check-constraint eval */
20932
+ int nNestSel; /* Number of nested SELECT statements and/or VIEWs */
20923
20933
  int nLabel; /* The *negative* of the number of labels used */
20924
20934
  int nLabelAlloc; /* Number of slots in aLabel */
20925
20935
  int *aLabel; /* Space to hold the labels */
@@ -27582,7 +27592,7 @@ SQLITE_PRIVATE int sqlite3OsCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *p
27582
27592
  }else{
27583
27593
  double r;
27584
27594
  rc = pVfs->xCurrentTime(pVfs, &r);
27585
- *pTimeOut = (sqlite3_int64)(r*86400000.0);
27595
+ *pTimeOut = sqlite3RealToI64(r*86400000.0);
27586
27596
  }
27587
27597
  return rc;
27588
27598
  }
@@ -39576,16 +39586,17 @@ int kvvfsDecode(const char *a, char *aOut, int nOut){
39576
39586
  while( 1 ){
39577
39587
  c = kvvfsHexValue[aIn[i]];
39578
39588
  if( c<0 ){
39579
- int n = 0;
39580
- int mult = 1;
39589
+ sqlite3_int64 n = 0;
39590
+ sqlite3_int64 mult = 1;
39581
39591
  c = aIn[i];
39582
39592
  if( c==0 ) break;
39583
39593
  while( c>='a' && c<='z' ){
39584
39594
  n += (c - 'a')*mult;
39595
+ if( n>nOut ) return -1 /* oversized/malformed input */;
39585
39596
  mult *= 26;
39586
39597
  c = aIn[++i];
39587
39598
  }
39588
- if( j+n>nOut ) return -1;
39599
+ if( j+n>nOut ) return -1 /* oversized/malformed input */;
39589
39600
  memset(&aOut[j], 0, n);
39590
39601
  j += n;
39591
39602
  if( c==0 || mult==1 ) break; /* progress stalled if mult==1 */
@@ -39621,7 +39632,7 @@ static void kvvfsDecodeJournal(
39621
39632
  i = 0;
39622
39633
  mult = 1;
39623
39634
  while( (c = zTxt[i++])>='a' && c<='z' ){
39624
- n += (zTxt[i] - 'a')*mult;
39635
+ n += (c - 'a')*mult;
39625
39636
  mult *= 26;
39626
39637
  }
39627
39638
  sqlite3_free(pFile->aJrnl);
@@ -39667,9 +39678,7 @@ static int kvvfsClose(sqlite3_file *pProtoFile){
39667
39678
  pFile->isJournal ? "journal" : "db"));
39668
39679
  sqlite3_free(pFile->aJrnl);
39669
39680
  sqlite3_free(pFile->aData);
39670
- #ifdef SQLITE_WASM
39671
39681
  memset(pFile, 0, sizeof(*pFile));
39672
- #endif
39673
39682
  return SQLITE_OK;
39674
39683
  }
39675
39684
 
@@ -39699,6 +39708,7 @@ static int kvvfsReadJrnl(
39699
39708
  aTxt, szTxt+1);
39700
39709
  if( rc>=0 ){
39701
39710
  kvvfsDecodeJournal(pFile, aTxt, szTxt);
39711
+ rc = 0;
39702
39712
  }
39703
39713
  sqlite3_free(aTxt);
39704
39714
  if( rc ) return rc;
@@ -49762,10 +49772,8 @@ static struct win_syscall {
49762
49772
  #define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \
49763
49773
  BOOL))aSyscall[63].pCurrent)
49764
49774
 
49765
- { "GetNativeSystemInfo", (SYSCALL)GetNativeSystemInfo, 0 },
49766
-
49767
- #define osGetNativeSystemInfo ((VOID(WINAPI*)( \
49768
- LPSYSTEM_INFO))aSyscall[64].pCurrent)
49775
+ { "GetNativeSystemInfo", (SYSCALL)0, 0 },
49776
+ /* ^^^^^^^^^^^^^^^^^^^----------------^------- placeholder only */
49769
49777
 
49770
49778
  #if defined(SQLITE_WIN32_HAS_ANSI)
49771
49779
  { "OutputDebugStringA", (SYSCALL)OutputDebugStringA, 0 },
@@ -53020,11 +53028,29 @@ SQLITE_API int sqlite3_win_test_unc_locking = 0;
53020
53028
 
53021
53029
  /*
53022
53030
  ** Return true if the string passed as the only argument is likely
53023
- ** to be a UNC path. In other words, if it starts with "\\".
53031
+ ** to be a UNC path. Return false if note.
53032
+ **
53033
+ ** Return true if:
53034
+ **
53035
+ ** (1) The name begins with "\\"
53036
+ ** (2) But does not begin with "\\?\C:\" where C can be any alphabetic
53037
+ ** character.
53038
+ **
53039
+ ** For testing, also return true in all cases if the global variable
53040
+ ** sqlite3_win_test_unc_locking is true.
53024
53041
  */
53025
53042
  static int winIsUNCPath(const char *zFile){
53026
53043
  if( zFile[0]=='\\' && zFile[1]=='\\' ){
53027
- return 1;
53044
+ if( zFile[2]=='?'
53045
+ && zFile[3]=='\\'
53046
+ && sqlite3Isalpha(zFile[4])
53047
+ && zFile[5]==':'
53048
+ && winIsDirSep(zFile[6])
53049
+ ){
53050
+ return sqlite3_win_test_unc_locking;
53051
+ }else{
53052
+ return 1;
53053
+ }
53028
53054
  }
53029
53055
  return sqlite3_win_test_unc_locking;
53030
53056
  }
@@ -56040,7 +56066,7 @@ SQLITE_API unsigned char *sqlite3_serialize(
56040
56066
  sqlite3_int64 sz;
56041
56067
  int szPage = 0;
56042
56068
  sqlite3_stmt *pStmt = 0;
56043
- unsigned char *pOut;
56069
+ unsigned char *pOut = 0;
56044
56070
  char *zSql;
56045
56071
  int rc;
56046
56072
 
@@ -56050,12 +56076,13 @@ SQLITE_API unsigned char *sqlite3_serialize(
56050
56076
  return 0;
56051
56077
  }
56052
56078
  #endif
56079
+ sqlite3_mutex_enter(db->mutex);
56053
56080
 
56054
56081
  if( zSchema==0 ) zSchema = db->aDb[0].zDbSName;
56055
56082
  p = memdbFromDbSchema(db, zSchema);
56056
56083
  iDb = sqlite3FindDbName(db, zSchema);
56057
56084
  if( piSize ) *piSize = -1;
56058
- if( iDb<0 ) return 0;
56085
+ if( iDb<0 ) goto serialize_out;
56059
56086
  if( p ){
56060
56087
  MemStore *pStore = p->pStore;
56061
56088
  assert( pStore->pMutex==0 );
@@ -56066,19 +56093,17 @@ SQLITE_API unsigned char *sqlite3_serialize(
56066
56093
  pOut = sqlite3_malloc64( pStore->sz );
56067
56094
  if( pOut ) memcpy(pOut, pStore->aData, pStore->sz);
56068
56095
  }
56069
- return pOut;
56096
+ goto serialize_out;
56070
56097
  }
56071
56098
  pBt = db->aDb[iDb].pBt;
56072
- if( pBt==0 ) return 0;
56099
+ if( pBt==0 ) goto serialize_out;
56073
56100
  szPage = sqlite3BtreeGetPageSize(pBt);
56074
56101
  zSql = sqlite3_mprintf("PRAGMA \"%w\".page_count", zSchema);
56075
56102
  rc = zSql ? sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0) : SQLITE_NOMEM;
56076
56103
  sqlite3_free(zSql);
56077
- if( rc ) return 0;
56104
+ if( rc ) goto serialize_out;
56078
56105
  rc = sqlite3_step(pStmt);
56079
- if( rc!=SQLITE_ROW ){
56080
- pOut = 0;
56081
- }else{
56106
+ if( rc==SQLITE_ROW ){
56082
56107
  sz = sqlite3_column_int64(pStmt, 0)*szPage;
56083
56108
  if( sz==0 ){
56084
56109
  sqlite3_reset(pStmt);
@@ -56112,6 +56137,9 @@ SQLITE_API unsigned char *sqlite3_serialize(
56112
56137
  }
56113
56138
  }
56114
56139
  sqlite3_finalize(pStmt);
56140
+
56141
+ serialize_out:
56142
+ sqlite3_mutex_leave(db->mutex);
56115
56143
  return pOut;
56116
56144
  }
56117
56145
 
@@ -57965,22 +57993,24 @@ static int pcache1InitBulk(PCache1 *pCache){
57965
57993
  if( szBulk > pCache->szAlloc*(i64)pCache->nMax ){
57966
57994
  szBulk = pCache->szAlloc*(i64)pCache->nMax;
57967
57995
  }
57968
- zBulk = pCache->pBulk = sqlite3Malloc( szBulk );
57969
- sqlite3EndBenignMalloc();
57970
- if( zBulk ){
57971
- int nBulk = sqlite3MallocSize(zBulk)/pCache->szAlloc;
57972
- do{
57973
- PgHdr1 *pX = (PgHdr1*)&zBulk[pCache->szPage];
57974
- pX->page.pBuf = zBulk;
57975
- pX->page.pExtra = (u8*)pX + ROUND8(sizeof(*pX));
57976
- assert( EIGHT_BYTE_ALIGNMENT( pX->page.pExtra ) );
57977
- pX->isBulkLocal = 1;
57978
- pX->isAnchor = 0;
57979
- pX->pNext = pCache->pFree;
57980
- pX->pLruPrev = 0; /* Initializing this saves a valgrind error */
57981
- pCache->pFree = pX;
57982
- zBulk += pCache->szAlloc;
57983
- }while( --nBulk );
57996
+ if( szBulk>=pCache->szAlloc ){
57997
+ zBulk = pCache->pBulk = sqlite3Malloc( szBulk );
57998
+ sqlite3EndBenignMalloc();
57999
+ if( zBulk ){
58000
+ int nBulk = sqlite3MallocSize(zBulk)/pCache->szAlloc;
58001
+ do{
58002
+ PgHdr1 *pX = (PgHdr1*)&zBulk[pCache->szPage];
58003
+ pX->page.pBuf = zBulk;
58004
+ pX->page.pExtra = (u8*)pX + ROUND8(sizeof(*pX));
58005
+ assert( EIGHT_BYTE_ALIGNMENT( pX->page.pExtra ) );
58006
+ pX->isBulkLocal = 1;
58007
+ pX->isAnchor = 0;
58008
+ pX->pNext = pCache->pFree;
58009
+ pX->pLruPrev = 0; /* Initializing this saves a valgrind error */
58010
+ pCache->pFree = pX;
58011
+ zBulk += pCache->szAlloc;
58012
+ }while( --nBulk );
58013
+ }
57984
58014
  }
57985
58015
  return pCache->pFree!=0;
57986
58016
  }
@@ -60878,39 +60908,43 @@ static void checkPage(PgHdr *pPg){
60878
60908
  #endif /* SQLITE_CHECK_PAGES */
60879
60909
 
60880
60910
  /*
60881
- ** When this is called the journal file for pager pPager must be open.
60882
- ** This function attempts to read a super-journal file name from the
60883
- ** end of the file and, if successful, copies it into memory supplied
60884
- ** by the caller. See comments above writeSuperJournal() for the format
60885
- ** used to store a super-journal file name at the end of a journal file.
60886
- **
60887
- ** zSuper must point to a buffer of at least nSuper bytes allocated by
60888
- ** the caller. This should be sqlite3_vfs.mxPathname+1 (to ensure there is
60889
- ** enough space to write the super-journal name). If the super-journal
60890
- ** name in the journal is longer than nSuper bytes (including a
60891
- ** nul-terminator), then this is handled as if no super-journal name
60892
- ** were present in the journal.
60911
+ ** Free a buffer allocated by the readSuperJournal() function.
60912
+ */
60913
+ static void freeSuperJournal(char *zSuper){
60914
+ if( zSuper ){
60915
+ sqlite3_free(&zSuper[-4]);
60916
+ }
60917
+ }
60918
+
60919
+ /*
60920
+ ** Parameter pJrnl is a file-handle open on a journal file. This function
60921
+ ** attempts to read a super-journal file name from the end of the journal
60922
+ ** file. If successful, it sets output parameter (*pzSuper) to point to a
60923
+ ** buffer containing the super-journal name as a nul-terminated string.
60924
+ ** The caller is responsible for freeing the buffer using freeSuperJournal().
60893
60925
  **
60894
- ** If a super-journal file name is present at the end of the journal
60895
- ** file, then it is copied into the buffer pointed to by zSuper. A
60896
- ** nul-terminator byte is appended to the buffer following the
60897
- ** super-journal file name.
60926
+ ** Refer to comments above writeSuperJournal() for the format used to store
60927
+ ** a super-journal file name at the end of a journal file.
60898
60928
  **
60899
- ** If it is determined that no super-journal file name is present
60900
- ** zSuper[0] is set to 0 and SQLITE_OK returned.
60929
+ ** Parameter nSuper is passed the maximum allowable size of the super journal
60930
+ ** name in bytes. If the super-journal name in the journal is longer than
60931
+ ** nSuper bytes (including a nul-terminator), then this is handled as if no
60932
+ ** super-journal name were present in the journal.
60901
60933
  **
60902
- ** If an error occurs while reading from the journal file, an SQLite
60903
- ** error code is returned.
60934
+ ** If there is no super-journal name at the end of pJrnl, (*pzSuper) is
60935
+ ** set to 0 and SQLITE_OK is returned. Or, if an error occurs while reading
60936
+ ** the super-journal name, an SQLite error code is returned and (*pzSuper)
60937
+ ** is set to 0.
60904
60938
  */
60905
- static int readSuperJournal(sqlite3_file *pJrnl, char *zSuper, u64 nSuper){
60939
+ static int readSuperJournal(sqlite3_file *pJrnl, u64 nSuper, char **pzSuper){
60906
60940
  int rc; /* Return code */
60907
60941
  u32 len; /* Length in bytes of super-journal name */
60908
60942
  i64 szJ; /* Total size in bytes of journal file pJrnl */
60909
60943
  u32 cksum; /* MJ checksum value read from journal */
60910
- u32 u; /* Unsigned loop counter */
60911
60944
  unsigned char aMagic[8]; /* A buffer to hold the magic header */
60912
- zSuper[0] = '\0';
60945
+ char *zOut = 0;
60913
60946
 
60947
+ *pzSuper = 0;
60914
60948
  if( SQLITE_OK!=(rc = sqlite3OsFileSize(pJrnl, &szJ))
60915
60949
  || szJ<16
60916
60950
  || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-16, &len))
@@ -60920,27 +60954,34 @@ static int readSuperJournal(sqlite3_file *pJrnl, char *zSuper, u64 nSuper){
60920
60954
  || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-12, &cksum))
60921
60955
  || SQLITE_OK!=(rc = sqlite3OsRead(pJrnl, aMagic, 8, szJ-8))
60922
60956
  || memcmp(aMagic, aJournalMagic, 8)
60923
- || SQLITE_OK!=(rc = sqlite3OsRead(pJrnl, zSuper, len, szJ-16-len))
60924
60957
  ){
60925
60958
  return rc;
60926
60959
  }
60927
60960
 
60928
- /* See if the checksum matches the super-journal name */
60929
- for(u=0; u<len; u++){
60930
- cksum -= zSuper[u];
60931
- }
60932
- if( cksum ){
60933
- /* If the checksum doesn't add up, then one or more of the disk sectors
60934
- ** containing the super-journal filename is corrupted. This means
60935
- ** definitely roll back, so just return SQLITE_OK and report a (nul)
60936
- ** super-journal filename.
60937
- */
60938
- len = 0;
60961
+ zOut = (char*)sqlite3MallocZero(4 + len + 2);
60962
+ if( !zOut ){
60963
+ rc = SQLITE_NOMEM_BKPT;
60964
+ }else{
60965
+ zOut = &zOut[4];
60966
+ if( SQLITE_OK==(rc = sqlite3OsRead(pJrnl, zOut, len, szJ-16-len)) ){
60967
+ u32 u; /* Unsigned loop counter */
60968
+ /* See if the checksum matches the super-journal name */
60969
+ for(u=0; u<len; u++){
60970
+ cksum -= zOut[u];
60971
+ }
60972
+ }
60973
+ if( rc!=SQLITE_OK || cksum || zOut[0]==0 ){
60974
+ /* If the checksum doesn't add up, then one or more of the disk sectors
60975
+ ** containing the super-journal filename is corrupted. This means
60976
+ ** definitely roll back, so just return SQLITE_OK and report a (nul)
60977
+ ** super-journal filename. */
60978
+ freeSuperJournal(zOut);
60979
+ zOut = 0;
60980
+ }
60939
60981
  }
60940
- zSuper[len] = '\0';
60941
- zSuper[len+1] = '\0';
60942
60982
 
60943
- return SQLITE_OK;
60983
+ *pzSuper = zOut;
60984
+ return rc;
60944
60985
  }
60945
60986
 
60946
60987
  /*
@@ -62094,6 +62135,40 @@ static int pager_playback_one_page(
62094
62135
  return rc;
62095
62136
  }
62096
62137
 
62138
+ /*
62139
+ ** Check if zSuper is a valid super-journal name. There are two valid
62140
+ ** formats:
62141
+ **
62142
+ ** + The 3rd and 4th last bytes of the filename are ".9", and the
62143
+ ** following 2 bytes are hex digits. This is a file created in 8.3
62144
+ ** filenames mode.
62145
+ **
62146
+ ** + The 3rd last byte of the filename is "9" and the filename
62147
+ ** contains the string "-mj" starting at the 12th last byte.
62148
+ ** All bytes following the "-mj" are hex digits.
62149
+ **
62150
+ ** If the filename matches either of these patterns, return non-zero.
62151
+ ** Otherwise, return zero.
62152
+ */
62153
+ static int pagerIsSuperJrnlName(const char *zSuper){
62154
+ const int nSuper = sqlite3Strlen30(zSuper);
62155
+ int ii;
62156
+
62157
+ if( nSuper<4 ) return 0;
62158
+ if( zSuper[nSuper-3]!='9' ) return 0;
62159
+ #ifdef SQLITE_ENABLE_8_3_NAMES
62160
+ if( sqlite3Isxdigit(zSuper[nSuper-2])==0 ) return 0;
62161
+ if( sqlite3Isxdigit(zSuper[nSuper-1])==0 ) return 0;
62162
+ if( zSuper[nSuper-4]=='.' ) return 1;
62163
+ #endif
62164
+ if( nSuper<12 ) return 0;
62165
+ if( memcmp(&zSuper[nSuper-12], "-mj", 3) ) return 0;
62166
+ for(ii=nSuper-9; ii<nSuper; ii++){
62167
+ if( sqlite3Isxdigit(zSuper[ii])==0 ) return 0;
62168
+ }
62169
+ return 1;
62170
+ }
62171
+
62097
62172
  /*
62098
62173
  ** Parameter zSuper is the name of a super-journal file. A single journal
62099
62174
  ** file that referred to the super-journal file has just been rolled back.
@@ -62145,9 +62220,16 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
62145
62220
  char *zSuperJournal = 0; /* Contents of super-journal file */
62146
62221
  i64 nSuperJournal; /* Size of super-journal file */
62147
62222
  char *zJournal; /* Pointer to one journal within MJ file */
62148
- char *zSuperPtr; /* Space to hold super-journal filename */
62149
62223
  char *zFree = 0; /* Free this buffer */
62150
- i64 nSuperPtr; /* Amount of space allocated to zSuperPtr[] */
62224
+ int bSeen = 0; /* If super-journal contains pPager->zJournal */
62225
+
62226
+ /* Check if this looks like a real super-journal name. If it does not,
62227
+ ** return SQLITE_OK without attempting to delete it. This is to limit
62228
+ ** the degree to which a crafted journal file can be used to cause
62229
+ ** SQLite to delete arbitrary files. */
62230
+ if( pagerIsSuperJrnlName(zSuper)==0 ){
62231
+ return SQLITE_OK;
62232
+ }
62151
62233
 
62152
62234
  /* Allocate space for both the pJournal and pSuper file descriptors.
62153
62235
  ** If successful, open the super-journal file for reading.
@@ -62170,9 +62252,8 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
62170
62252
  */
62171
62253
  rc = sqlite3OsFileSize(pSuper, &nSuperJournal);
62172
62254
  if( rc!=SQLITE_OK ) goto delsuper_out;
62173
- nSuperPtr = 1 + (i64)pVfs->mxPathname;
62174
- assert( nSuperJournal>=0 && nSuperPtr>0 );
62175
- zFree = sqlite3Malloc(4 + nSuperJournal + 2 + nSuperPtr + 2);
62255
+ assert( nSuperJournal>=0 );
62256
+ zFree = sqlite3Malloc(4 + nSuperJournal + 2);
62176
62257
  if( !zFree ){
62177
62258
  rc = SQLITE_NOMEM_BKPT;
62178
62259
  goto delsuper_out;
@@ -62181,7 +62262,6 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
62181
62262
  }
62182
62263
  zFree[0] = zFree[1] = zFree[2] = zFree[3] = 0;
62183
62264
  zSuperJournal = &zFree[4];
62184
- zSuperPtr = &zSuperJournal[nSuperJournal+2];
62185
62265
  rc = sqlite3OsRead(pSuper, zSuperJournal, (int)nSuperJournal, 0);
62186
62266
  if( rc!=SQLITE_OK ) goto delsuper_out;
62187
62267
  zSuperJournal[nSuperJournal] = 0;
@@ -62189,43 +62269,56 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
62189
62269
 
62190
62270
  zJournal = zSuperJournal;
62191
62271
  while( (zJournal-zSuperJournal)<nSuperJournal ){
62192
- int exists;
62193
- rc = sqlite3OsAccess(pVfs, zJournal, SQLITE_ACCESS_EXISTS, &exists);
62194
- if( rc!=SQLITE_OK ){
62195
- goto delsuper_out;
62196
- }
62197
- if( exists ){
62198
- /* One of the journals pointed to by the super-journal exists.
62199
- ** Open it and check if it points at the super-journal. If
62200
- ** so, return without deleting the super-journal file.
62201
- ** NB: zJournal is really a MAIN_JOURNAL. But call it a
62202
- ** SUPER_JOURNAL here so that the VFS will not send the zJournal
62203
- ** name into sqlite3_database_file_object().
62204
- */
62205
- int c;
62206
- int flags = (SQLITE_OPEN_READONLY|SQLITE_OPEN_SUPER_JOURNAL);
62207
- rc = sqlite3OsOpen(pVfs, zJournal, pJournal, flags, 0);
62272
+ if( strcmp(zJournal, pPager->zJournal)==0 ){
62273
+ bSeen = 1;
62274
+ }else{
62275
+ int exists;
62276
+ rc = sqlite3OsAccess(pVfs, zJournal, SQLITE_ACCESS_EXISTS, &exists);
62208
62277
  if( rc!=SQLITE_OK ){
62209
62278
  goto delsuper_out;
62210
62279
  }
62280
+ if( exists ){
62281
+ char *zSuperPtr = 0;
62211
62282
 
62212
- rc = readSuperJournal(pJournal, zSuperPtr, nSuperPtr);
62213
- sqlite3OsClose(pJournal);
62214
- if( rc!=SQLITE_OK ){
62215
- goto delsuper_out;
62216
- }
62283
+ /* One of the journals pointed to by the super-journal exists.
62284
+ ** Open it and check if it points at the super-journal. If
62285
+ ** so, return without deleting the super-journal file.
62286
+ ** NB: zJournal is really a MAIN_JOURNAL. But call it a
62287
+ ** SUPER_JOURNAL here so that the VFS will not send the zJournal
62288
+ ** name into sqlite3_database_file_object().
62289
+ */
62290
+ int c;
62291
+ int flags = (SQLITE_OPEN_READONLY|SQLITE_OPEN_SUPER_JOURNAL);
62292
+ rc = sqlite3OsOpen(pVfs, zJournal, pJournal, flags, 0);
62293
+ if( rc!=SQLITE_OK ){
62294
+ goto delsuper_out;
62295
+ }
62217
62296
 
62218
- c = zSuperPtr[0]!=0 && strcmp(zSuperPtr, zSuper)==0;
62219
- if( c ){
62220
- /* We have a match. Do not delete the super-journal file. */
62221
- goto delsuper_out;
62297
+ rc = readSuperJournal(pJournal, 1+(u64)pVfs->mxPathname, &zSuperPtr);
62298
+ sqlite3OsClose(pJournal);
62299
+ if( rc!=SQLITE_OK ){
62300
+ assert( zSuperPtr==0 );
62301
+ goto delsuper_out;
62302
+ }
62303
+
62304
+ c = zSuperPtr!=0 && strcmp(zSuperPtr, zSuper)==0;
62305
+ freeSuperJournal(zSuperPtr);
62306
+ if( c ){
62307
+ /* We have a match. Do not delete the super-journal file. */
62308
+ goto delsuper_out;
62309
+ }
62222
62310
  }
62223
62311
  }
62224
62312
  zJournal += (sqlite3Strlen30(zJournal)+1);
62225
62313
  }
62226
62314
 
62227
62315
  sqlite3OsClose(pSuper);
62228
- rc = sqlite3OsDelete(pVfs, zSuper, 0);
62316
+ if( bSeen ){
62317
+ /* Only delete the super-journal if bSeen is true - indicating that
62318
+ ** the super-journal contained a pointer to this database's journal
62319
+ ** file. */
62320
+ rc = sqlite3OsDelete(pVfs, zSuper, 0);
62321
+ }
62229
62322
 
62230
62323
  delsuper_out:
62231
62324
  sqlite3_free(zFree);
@@ -62430,19 +62523,11 @@ static int pager_playback(Pager *pPager, int isHot){
62430
62523
  ** If a super-journal file name is specified, but the file is not
62431
62524
  ** present on disk, then the journal is not hot and does not need to be
62432
62525
  ** played back.
62433
- **
62434
- ** TODO: Technically the following is an error because it assumes that
62435
- ** buffer Pager.pTmpSpace is (mxPathname+1) bytes or larger. i.e. that
62436
- ** ((pPager->pageSize+8) >= pPager->pVfs->mxPathname+1). Using os_unix.c,
62437
- ** mxPathname is 512, which is the same as the minimum allowable value
62438
- ** for pageSize, and so this assumption holds. But it might not for some
62439
- ** custom VFS. */
62440
- zSuper = pPager->pTmpSpace;
62441
- rc = readSuperJournal(pPager->jfd, zSuper, 1+(i64)pPager->pVfs->mxPathname);
62442
- if( rc==SQLITE_OK && zSuper[0] ){
62526
+ */
62527
+ rc = readSuperJournal(pPager->jfd, 1+(i64)pPager->pVfs->mxPathname, &zSuper);
62528
+ if( rc==SQLITE_OK && zSuper ){
62443
62529
  rc = sqlite3OsAccess(pVfs, zSuper, SQLITE_ACCESS_EXISTS, &res);
62444
62530
  }
62445
- zSuper = 0;
62446
62531
  if( rc!=SQLITE_OK || !res ){
62447
62532
  goto end_playback;
62448
62533
  }
@@ -62571,30 +62656,20 @@ end_playback:
62571
62656
  */
62572
62657
  pPager->changeCountDone = pPager->tempFile;
62573
62658
 
62574
- if( rc==SQLITE_OK ){
62575
- /* Leave 4 bytes of space before the super-journal filename in memory.
62576
- ** This is because it may end up being passed to sqlite3OsOpen(), in
62577
- ** which case it requires 4 0x00 bytes in memory immediately before
62578
- ** the filename. */
62579
- zSuper = &pPager->pTmpSpace[4];
62580
- rc = readSuperJournal(pPager->jfd, zSuper, 1+(i64)pPager->pVfs->mxPathname);
62581
- testcase( rc!=SQLITE_OK );
62582
- }
62583
62659
  if( rc==SQLITE_OK
62584
62660
  && (pPager->eState>=PAGER_WRITER_DBMOD || pPager->eState==PAGER_OPEN)
62585
62661
  ){
62586
62662
  rc = sqlite3PagerSync(pPager, 0);
62587
62663
  }
62588
62664
  if( rc==SQLITE_OK ){
62589
- rc = pager_end_transaction(pPager, zSuper[0]!='\0', 0);
62665
+ rc = pager_end_transaction(pPager, zSuper!=0, 0);
62590
62666
  testcase( rc!=SQLITE_OK );
62591
62667
  }
62592
- if( rc==SQLITE_OK && zSuper[0] && res ){
62668
+ if( rc==SQLITE_OK && zSuper && res ){
62593
62669
  /* If there was a super-journal and this routine will return success,
62594
62670
  ** see if it is possible to delete the super-journal.
62595
62671
  */
62596
- assert( zSuper==&pPager->pTmpSpace[4] );
62597
- memset(pPager->pTmpSpace, 0, 4);
62672
+ assert( memcmp(&zSuper[-4], "\0\0\0\0", 4)==0 );
62598
62673
  rc = pager_delsuper(pPager, zSuper);
62599
62674
  testcase( rc!=SQLITE_OK );
62600
62675
  }
@@ -62607,6 +62682,7 @@ end_playback:
62607
62682
  ** back a journal created by a process with a different sector size
62608
62683
  ** value. Reset it to the correct value for this process.
62609
62684
  */
62685
+ freeSuperJournal(zSuper);
62610
62686
  setSectorSize(pPager);
62611
62687
  return rc;
62612
62688
  }
@@ -68466,6 +68542,12 @@ static int walDecodeFrame(
68466
68542
  return 0;
68467
68543
  }
68468
68544
 
68545
+ /* Need a valid page size
68546
+ */
68547
+ if( !pWal->szPage ){
68548
+ return 0;
68549
+ }
68550
+
68469
68551
  /* A frame is only valid if a checksum of the WAL header,
68470
68552
  ** all prior frames, the first 16 bytes of this frame-header,
68471
68553
  ** and the frame-data matches the checksum in the last 8
@@ -70320,7 +70402,7 @@ static int walBeginShmUnreliable(Wal *pWal, int *pChanged){
70320
70402
 
70321
70403
  /* Allocate a buffer to read frames into */
70322
70404
  assert( (pWal->szPage & (pWal->szPage-1))==0 );
70323
- assert( pWal->szPage>=512 && pWal->szPage<=65536 );
70405
+ assert( (pWal->szPage>=512 && pWal->szPage<=65536) || pWal->szPage==0 );
70324
70406
  szFrame = pWal->szPage + WAL_FRAME_HDRSIZE;
70325
70407
  aFrame = (u8 *)sqlite3_malloc64(szFrame);
70326
70408
  if( aFrame==0 ){
@@ -72818,6 +72900,9 @@ struct IntegrityCk {
72818
72900
  u32 *heap; /* Min-heap used for analyzing cell coverage */
72819
72901
  sqlite3 *db; /* Database connection running the check */
72820
72902
  i64 nRow; /* Number of rows visited in current tree */
72903
+ #ifdef SQLITE_DEBUG
72904
+ u32 mxHeap; /* Maximum number of entries in the Min-heap */
72905
+ #endif
72821
72906
  };
72822
72907
 
72823
72908
  /*
@@ -75279,8 +75364,12 @@ static int btreeComputeFreeSpace(MemPage *pPage){
75279
75364
  }
75280
75365
  next = get2byte(&data[pc]);
75281
75366
  size = get2byte(&data[pc+2]);
75367
+ if( size<4 ){
75368
+ /* Minimum freeblock size is 4 */
75369
+ return SQLITE_CORRUPT_PAGE(pPage);
75370
+ }
75282
75371
  nFree = nFree + size;
75283
- if( next<=pc+size+3 ) break;
75372
+ if( next<pc+size+4 ) break;
75284
75373
  pc = next;
75285
75374
  }
75286
75375
  if( next>0 ){
@@ -79113,14 +79202,14 @@ static int indexCellCompare(
79113
79202
  /* This branch runs if the record-size field of the cell is a
79114
79203
  ** single byte varint and the record fits entirely on the main
79115
79204
  ** b-tree page. */
79116
- testcase( pCell+nCell+1==pPage->aDataEnd );
79205
+ if( pCell + nCell >= pPage->aDataEnd ) return 99;
79117
79206
  c = xRecordCompare(nCell, (void*)&pCell[1], pIdxKey);
79118
79207
  }else if( !(pCell[1] & 0x80)
79119
79208
  && (nCell = ((nCell&0x7f)<<7) + pCell[1])<=pPage->maxLocal
79120
79209
  ){
79121
79210
  /* The record-size field is a 2 byte varint and the record
79122
79211
  ** fits entirely on the main b-tree page. */
79123
- testcase( pCell+nCell+2==pPage->aDataEnd );
79212
+ if( pCell + nCell >= pPage->aDataEnd ) return 99;
79124
79213
  c = xRecordCompare(nCell, (void*)&pCell[2], pIdxKey);
79125
79214
  }else{
79126
79215
  /* If the record extends into overflow pages, do not attempt
@@ -79282,14 +79371,17 @@ bypass_moveto_root:
79282
79371
  /* This branch runs if the record-size field of the cell is a
79283
79372
  ** single byte varint and the record fits entirely on the main
79284
79373
  ** b-tree page. */
79285
- testcase( pCell+nCell+1==pPage->aDataEnd );
79374
+ if( pCell + nCell >= pPage->aDataEnd ){
79375
+ rc = SQLITE_CORRUPT_PAGE(pPage);
79376
+ goto moveto_index_finish;
79377
+ }
79286
79378
  c = xRecordCompare(nCell, (void*)&pCell[1], pIdxKey);
79287
79379
  }else if( !(pCell[1] & 0x80)
79288
79380
  && (nCell = ((nCell&0x7f)<<7) + pCell[1])<=pPage->maxLocal
79381
+ && pCell + nCell < pPage->aDataEnd
79289
79382
  ){
79290
79383
  /* The record-size field is a 2 byte varint and the record
79291
79384
  ** fits entirely on the main b-tree page. */
79292
- testcase( pCell+nCell+2==pPage->aDataEnd );
79293
79385
  c = xRecordCompare(nCell, (void*)&pCell[2], pIdxKey);
79294
79386
  }else{
79295
79387
  /* The record flows over onto one or more overflow pages. In
@@ -84154,6 +84246,7 @@ static int checkTreePage(
84154
84246
  }
84155
84247
  }else{
84156
84248
  /* Populate the coverage-checking heap for leaf pages */
84249
+ assert( heap[0] < pCheck->mxHeap );
84157
84250
  btreeHeapInsert(heap, (pc<<16)|(pc+info.nSize-1));
84158
84251
  }
84159
84252
  }
@@ -84173,6 +84266,7 @@ static int checkTreePage(
84173
84266
  u32 size;
84174
84267
  pc = get2byteAligned(&data[cellStart+i*2]);
84175
84268
  size = pPage->xCellSize(pPage, &data[pc]);
84269
+ assert( heap[0] < pCheck->mxHeap );
84176
84270
  btreeHeapInsert(heap, (pc<<16)|(pc+size-1));
84177
84271
  }
84178
84272
  }
@@ -84189,6 +84283,7 @@ static int checkTreePage(
84189
84283
  assert( (u32)i<=usableSize-4 ); /* Enforced by btreeComputeFreeSpace() */
84190
84284
  size = get2byte(&data[i+2]);
84191
84285
  assert( (u32)(i+size)<=usableSize ); /* due to btreeComputeFreeSpace() */
84286
+ assert( heap[0] < pCheck->mxHeap );
84192
84287
  btreeHeapInsert(heap, (((u32)i)<<16)|(i+size-1));
84193
84288
  /* EVIDENCE-OF: R-58208-19414 The first 2 bytes of a freeblock are a
84194
84289
  ** big-endian integer which is the offset in the b-tree page of the next
@@ -84323,6 +84418,9 @@ SQLITE_PRIVATE int sqlite3BtreeIntegrityCheck(
84323
84418
  goto integrity_ck_cleanup;
84324
84419
  }
84325
84420
  sCheck.heap = (u32*)sqlite3PageMalloc( pBt->pageSize );
84421
+ #ifdef SQLITE_DEBUG
84422
+ sCheck.mxHeap = pBt->pageSize/4 - 1;
84423
+ #endif
84326
84424
  if( sCheck.heap==0 ){
84327
84425
  checkOom(&sCheck);
84328
84426
  goto integrity_ck_cleanup;
@@ -84740,6 +84838,7 @@ SQLITE_PRIVATE int sqlite3BtreeConnectionCount(Btree *p){
84740
84838
  */
84741
84839
  struct sqlite3_backup {
84742
84840
  sqlite3* pDestDb; /* Destination database handle */
84841
+ char *zDestDb;
84743
84842
  Btree *pDest; /* Destination b-tree file */
84744
84843
  u32 iDestSchema; /* Original schema cookie in destination */
84745
84844
  int bDestLocked; /* True once a write-transaction is open on pDest */
@@ -84829,10 +84928,8 @@ static Btree *findBtree(sqlite3 *pErrorDb, sqlite3 *pDb, const char *zDb){
84829
84928
  ** Attempt to set the page size of the destination to match the page size
84830
84929
  ** of the source.
84831
84930
  */
84832
- static int setDestPgsz(sqlite3_backup *p){
84833
- int rc;
84834
- rc = sqlite3BtreeSetPageSize(p->pDest,sqlite3BtreeGetPageSize(p->pSrc),0,0);
84835
- return rc;
84931
+ static int setDestPgsz(Btree *pDest, Btree *pSrc){
84932
+ return sqlite3BtreeSetPageSize(pDest, sqlite3BtreeGetPageSize(pSrc), 0, 0);
84836
84933
  }
84837
84934
 
84838
84935
  /*
@@ -84889,27 +84986,37 @@ SQLITE_API sqlite3_backup *sqlite3_backup_init(
84889
84986
  );
84890
84987
  p = 0;
84891
84988
  }else {
84989
+ int nDest = sqlite3Strlen30(zDestDb);
84990
+
84892
84991
  /* Allocate space for a new sqlite3_backup object...
84893
84992
  ** EVIDENCE-OF: R-64852-21591 The sqlite3_backup object is created by a
84894
84993
  ** call to sqlite3_backup_init() and is destroyed by a call to
84895
84994
  ** sqlite3_backup_finish(). */
84896
- p = (sqlite3_backup *)sqlite3MallocZero(sizeof(sqlite3_backup));
84995
+ p = (sqlite3_backup*)sqlite3MallocZero(sizeof(sqlite3_backup)+nDest+1);
84897
84996
  if( !p ){
84898
84997
  sqlite3Error(pDestDb, SQLITE_NOMEM_BKPT);
84998
+ }else{
84999
+ p->zDestDb = (char*)&p[1];
85000
+ memcpy(p->zDestDb, zDestDb, nDest);
84899
85001
  }
84900
85002
  }
84901
85003
 
84902
85004
  /* If the allocation succeeded, populate the new object. */
84903
85005
  if( p ){
85006
+ /* Do not store the pointer to the destination b-tree at this point.
85007
+ ** This is because there is nothing preventing it from being detached
85008
+ ** or otherwise freed before the first call to sqlite3_backup_step()
85009
+ ** on this object. The source b-tree does not have this problem, as
85010
+ ** incrementing Btree.nBackup (see below) effectively locks the object. */
85011
+ Btree *pDest = findBtree(pDestDb, pDestDb, zDestDb);
84904
85012
  p->pSrc = findBtree(pDestDb, pSrcDb, zSrcDb);
84905
- p->pDest = findBtree(pDestDb, pDestDb, zDestDb);
84906
85013
  p->pDestDb = pDestDb;
84907
85014
  p->pSrcDb = pSrcDb;
84908
85015
  p->iNext = 1;
84909
85016
  p->isAttached = 0;
84910
85017
 
84911
- if( 0==p->pSrc || 0==p->pDest
84912
- || checkReadTransaction(pDestDb, p->pDest)!=SQLITE_OK
85018
+ if( 0==p->pSrc || 0==pDest
85019
+ || checkReadTransaction(pDestDb, pDest)!=SQLITE_OK
84913
85020
  ){
84914
85021
  /* One (or both) of the named databases did not exist or an OOM
84915
85022
  ** error was hit. Or there is a transaction open on the destination
@@ -85033,7 +85140,7 @@ static void attachBackupObject(sqlite3_backup *p){
85033
85140
  */
85034
85141
  SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage){
85035
85142
  int rc;
85036
- int destMode; /* Destination journal mode */
85143
+ int destMode = 0; /* Destination journal mode */
85037
85144
  int pgszSrc = 0; /* Source page size */
85038
85145
  int pgszDest = 0; /* Destination page size */
85039
85146
 
@@ -85049,7 +85156,8 @@ SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage){
85049
85156
  rc = p->rc;
85050
85157
  if( !isFatalError(rc) ){
85051
85158
  Pager * const pSrcPager = sqlite3BtreePager(p->pSrc); /* Source pager */
85052
- Pager * const pDestPager = sqlite3BtreePager(p->pDest); /* Dest pager */
85159
+ Btree * pDest = 0; /* Dest btree */
85160
+ Pager * pDestPager = 0; /* Dest pager */
85053
85161
  int ii; /* Iterator variable */
85054
85162
  int nSrcPage = -1; /* Size of source db in pages */
85055
85163
  int bCloseTrans = 0; /* True if src db requires unlocking */
@@ -85063,6 +85171,7 @@ SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage){
85063
85171
  rc = SQLITE_OK;
85064
85172
  }
85065
85173
 
85174
+
85066
85175
  /* If there is no open read-transaction on the source database, open
85067
85176
  ** one now. If a transaction is opened here, then it will be closed
85068
85177
  ** before this function exits.
@@ -85072,34 +85181,48 @@ SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage){
85072
85181
  bCloseTrans = 1;
85073
85182
  }
85074
85183
 
85184
+ /* Locate the destination btree and pager. */
85185
+ if( (pDest = p->pDest)==0 ){
85186
+ pDest = findBtree(p->pDestDb, p->pDestDb, p->zDestDb);
85187
+ }
85188
+ if( pDest==0 ){
85189
+ rc = SQLITE_ERROR;
85190
+ }else{
85191
+ pDestPager = sqlite3BtreePager(pDest);
85192
+ }
85193
+
85075
85194
  /* If the destination database has not yet been locked (i.e. if this
85076
85195
  ** is the first call to backup_step() for the current backup operation),
85077
85196
  ** try to set its page size to the same as the source database. This
85078
85197
  ** is especially important on ZipVFS systems, as in that case it is
85079
85198
  ** not possible to create a database file that uses one page size by
85080
85199
  ** writing to it with another. */
85081
- if( p->bDestLocked==0 && rc==SQLITE_OK && setDestPgsz(p)==SQLITE_NOMEM ){
85200
+ if( p->bDestLocked==0 && rc==SQLITE_OK
85201
+ && setDestPgsz(pDest, p->pSrc)==SQLITE_NOMEM
85202
+ ){
85082
85203
  rc = SQLITE_NOMEM;
85083
85204
  }
85084
85205
 
85085
85206
  /* Lock the destination database, if it is not locked already. */
85086
85207
  if( SQLITE_OK==rc && p->bDestLocked==0
85087
- && SQLITE_OK==(rc = sqlite3BtreeBeginTrans(p->pDest, 2,
85208
+ && SQLITE_OK==(rc = sqlite3BtreeBeginTrans(pDest, 2,
85088
85209
  (int*)&p->iDestSchema))
85089
85210
  ){
85090
85211
  p->bDestLocked = 1;
85212
+ p->pDest = pDest;
85091
85213
  }
85092
85214
 
85093
85215
  /* Do not allow backup if the destination database is in WAL mode
85094
85216
  ** and the page sizes are different between source and destination */
85095
- pgszSrc = sqlite3BtreeGetPageSize(p->pSrc);
85096
- pgszDest = sqlite3BtreeGetPageSize(p->pDest);
85097
- destMode = sqlite3PagerGetJournalMode(sqlite3BtreePager(p->pDest));
85098
- if( SQLITE_OK==rc
85099
- && (destMode==PAGER_JOURNALMODE_WAL || sqlite3PagerIsMemdb(pDestPager))
85100
- && pgszSrc!=pgszDest
85101
- ){
85102
- rc = SQLITE_READONLY;
85217
+ if( rc==SQLITE_OK ){
85218
+ pgszSrc = sqlite3BtreeGetPageSize(p->pSrc);
85219
+ pgszDest = sqlite3BtreeGetPageSize(p->pDest);
85220
+ destMode = sqlite3PagerGetJournalMode(sqlite3BtreePager(p->pDest));
85221
+ if( (destMode==PAGER_JOURNALMODE_WAL || sqlite3PagerIsMemdb(pDestPager))
85222
+ && pgszSrc!=pgszDest
85223
+ ){
85224
+ rc = SQLITE_READONLY;
85225
+ }
85103
85226
  }
85104
85227
 
85105
85228
  /* Now that there is a read-lock on the source database, query the
@@ -85317,7 +85440,9 @@ SQLITE_API int sqlite3_backup_finish(sqlite3_backup *p){
85317
85440
  }
85318
85441
 
85319
85442
  /* If a transaction is still open on the Btree, roll it back. */
85320
- sqlite3BtreeRollback(p->pDest, SQLITE_OK, 0);
85443
+ if( p->pDest ){
85444
+ sqlite3BtreeRollback(p->pDest, SQLITE_OK, 0);
85445
+ }
85321
85446
 
85322
85447
  /* Set the error code of the destination database handle. */
85323
85448
  rc = (p->rc==SQLITE_DONE) ? SQLITE_OK : p->rc;
@@ -93585,8 +93710,14 @@ SQLITE_PRIVATE const char *sqlite3VdbeFuncName(const sqlite3_context *pCtx){
93585
93710
  ** added or changed.
93586
93711
  */
93587
93712
  SQLITE_API int sqlite3_expired(sqlite3_stmt *pStmt){
93588
- Vdbe *p = (Vdbe*)pStmt;
93589
- return p==0 || p->expired;
93713
+ int iRet = 1;
93714
+ if( pStmt ){
93715
+ Vdbe *p = (Vdbe*)pStmt;
93716
+ sqlite3_mutex_enter(p->db->mutex);
93717
+ iRet = p->expired;
93718
+ sqlite3_mutex_leave(p->db->mutex);
93719
+ }
93720
+ return iRet;
93590
93721
  }
93591
93722
  #endif
93592
93723
 
@@ -111307,11 +111438,20 @@ static SQLITE_NOINLINE void resolveSetExprSubtypeArg(ExprList *pList){
111307
111438
  nn = pList ? pList->nExpr : 0;
111308
111439
  for(ii=0; ii<nn; ii++){
111309
111440
  Expr *pExpr = pList->a[ii].pExpr;
111310
- ExprSetProperty(pExpr, EP_SubtArg);
111311
- if( pExpr->op==TK_SELECT ){
111312
- assert( ExprUseXSelect(pExpr) );
111313
- assert( pExpr->x.pSelect!=0 );
111314
- resolveSetExprSubtypeArg(pExpr->x.pSelect->pEList);
111441
+ while( 1 /*exit-by-break*/ ){
111442
+ ExprSetProperty(pExpr, EP_SubtArg);
111443
+ if( pExpr->op==TK_SELECT ){
111444
+ assert( ExprUseXSelect(pExpr) );
111445
+ assert( pExpr->x.pSelect!=0 );
111446
+ resolveSetExprSubtypeArg(pExpr->x.pSelect->pEList);
111447
+ break;
111448
+ }
111449
+ if( pExpr->op==TK_UPLUS ){
111450
+ pExpr = pExpr->pLeft;
111451
+ assert( pExpr!=0 );
111452
+ }else{
111453
+ break;
111454
+ }
111315
111455
  }
111316
111456
  }
111317
111457
  }
@@ -116881,7 +117021,7 @@ static void sqlite3ExprCodeIN(
116881
117021
  Expr *p = sqlite3VectorFieldSubexpr(pExpr->pLeft, i);
116882
117022
  if( pParse->nErr ) goto sqlite3ExprCodeIN_oom_error;
116883
117023
  if( sqlite3ExprCanBeNull(p) ){
116884
- sqlite3VdbeAddOp2(v, OP_IsNull, rLhs+i, destStep2);
117024
+ sqlite3VdbeAddOp2(v, OP_IsNull, rLhs+aiMap[i], destStep2);
116885
117025
  VdbeCoverage(v);
116886
117026
  }
116887
117027
  }
@@ -116965,8 +117105,8 @@ static void sqlite3ExprCodeIN(
116965
117105
  ** ...)" is the collating sequence of x.". */
116966
117106
  pColl = sqlite3ExprCollSeq(pParse, p);
116967
117107
  }
116968
- sqlite3VdbeAddOp3(v, OP_Column, iTab, i, r3);
116969
- sqlite3VdbeAddOp4(v, OP_Ne, rLhs+i, destNotNull, r3,
117108
+ sqlite3VdbeAddOp3(v, OP_Column, iTab, aiMap[i], r3);
117109
+ sqlite3VdbeAddOp4(v, OP_Ne, rLhs+aiMap[i], destNotNull, r3,
116970
117110
  (void*)pColl, P4_COLLSEQ);
116971
117111
  VdbeCoverage(v);
116972
117112
  sqlite3ReleaseTempReg(pParse, r3);
@@ -125305,9 +125445,9 @@ static int loadStatTbl(
125305
125445
  }
125306
125446
  pIdx->nSampleCol = nIdxCol;
125307
125447
  pIdx->mxSample = nSample;
125308
- nByte = ROUND8(sizeof(IndexSample) * nSample);
125309
- nByte += sizeof(tRowcnt) * nIdxCol * 3 * nSample;
125310
- nByte += nIdxCol * sizeof(tRowcnt); /* Space for Index.aAvgEq[] */
125448
+ nByte = ROUND8(sizeof64(IndexSample) * nSample);
125449
+ nByte += sizeof64(tRowcnt) * nIdxCol * 3 * nSample;
125450
+ nByte += nIdxCol * sizeof64(tRowcnt); /* Space for Index.aAvgEq[] */
125311
125451
 
125312
125452
  pIdx->aSample = sqlite3DbMallocZero(db, nByte);
125313
125453
  if( pIdx->aSample==0 ){
@@ -125315,7 +125455,7 @@ static int loadStatTbl(
125315
125455
  return SQLITE_NOMEM_BKPT;
125316
125456
  }
125317
125457
  pPtr = (u8*)pIdx->aSample;
125318
- pPtr += ROUND8(nSample*sizeof(pIdx->aSample[0]));
125458
+ pPtr += ROUND8(nSample*sizeof64(pIdx->aSample[0]));
125319
125459
  pSpace = (tRowcnt*)pPtr;
125320
125460
  assert( EIGHT_BYTE_ALIGNMENT( pSpace ) );
125321
125461
  pIdx->aAvgEq = pSpace; pSpace += nIdxCol;
@@ -136787,7 +136927,7 @@ static void percentSort(double *a, unsigned int n){
136787
136927
  i++;
136788
136928
  }
136789
136929
  }while( i<iGt );
136790
- if( iLt>n/2 ){
136930
+ if( iLt>(int)(n/2) ){
136791
136931
  if( n-iGt>=2 ) percentSort(a+iGt, n-iGt);
136792
136932
  n = iLt;
136793
136933
  }else{
@@ -151304,6 +151444,13 @@ SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect, c
151304
151444
  sqlite3 *db = pParse->db;
151305
151445
  u64 savedFlags;
151306
151446
 
151447
+ pParse->nNestSel++;
151448
+ #if SQLITE_MAX_EXPR_DEPTH>0
151449
+ if( pParse->nNestSel >= db->aLimit[SQLITE_LIMIT_EXPR_DEPTH] ){
151450
+ sqlite3ErrorMsg(pParse, "VIEWs and/or subqueries nested too deep");
151451
+ return 0;
151452
+ }
151453
+ #endif
151307
151454
  savedFlags = db->flags;
151308
151455
  db->flags &= ~(u64)SQLITE_FullColNames;
151309
151456
  db->flags |= SQLITE_ShortColNames;
@@ -151325,6 +151472,8 @@ SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect, c
151325
151472
  sqlite3DeleteTable(db, pTab);
151326
151473
  return 0;
151327
151474
  }
151475
+ pParse->nNestSel--;
151476
+ assert( pParse->nNestSel>=0 );
151328
151477
  return pTab;
151329
151478
  }
151330
151479
 
@@ -159268,7 +159417,7 @@ static TriggerPrg *codeRowTrigger(
159268
159417
  Table *pTab, /* The table pTrigger is attached to */
159269
159418
  int orconf /* ON CONFLICT policy to code trigger program with */
159270
159419
  ){
159271
- Parse *pTop = sqlite3ParseToplevel(pParse);
159420
+ Parse *pTop; /* Top level Parse object */
159272
159421
  sqlite3 *db = pParse->db; /* Database handle */
159273
159422
  TriggerPrg *pPrg; /* Value to return */
159274
159423
  Expr *pWhen = 0; /* Duplicate of trigger WHEN expression */
@@ -159277,10 +159426,24 @@ static TriggerPrg *codeRowTrigger(
159277
159426
  SubProgram *pProgram = 0; /* Sub-vdbe for trigger program */
159278
159427
  int iEndTrigger = 0; /* Label to jump to if WHEN is false */
159279
159428
  Parse sSubParse; /* Parse context for sub-vdbe */
159429
+ int nDepth; /* Trigger depth */
159430
+
159431
+ /* Ensure that triggers are not chained too deep. This test is linear
159432
+ ** in the chaining depth, but sensible code ought not be chaining
159433
+ ** triggers excessively, so that shouldn't be a problem.
159434
+ */
159435
+ pTop = pParse;
159436
+ for(nDepth=0; pTop->pOuterParse; pTop = pTop->pOuterParse, nDepth++){}
159437
+ if( nDepth>=db->aLimit[SQLITE_LIMIT_TRIGGER_DEPTH] ){
159438
+ sqlite3ErrorMsg(pParse, "triggers nested too deep");
159439
+ return 0;
159440
+ }
159280
159441
 
159442
+ pTop = sqlite3ParseToplevel(pParse);
159281
159443
  assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger) );
159282
159444
  assert( pTop->pVdbe );
159283
159445
 
159446
+
159284
159447
  /* Allocate the TriggerPrg and SubProgram objects. To ensure that they
159285
159448
  ** are freed if an error occurs, link them into the Parse.pTriggerPrg
159286
159449
  ** list of the top-level Parse object sooner rather than later. */
@@ -161281,7 +161444,8 @@ SQLITE_PRIVATE void sqlite3UpsertDoUpdate(
161281
161444
  /* excluded.* columns of type REAL need to be converted to a hard real */
161282
161445
  for(i=0; i<pTab->nCol; i++){
161283
161446
  if( pTab->aCol[i].affinity==SQLITE_AFF_REAL ){
161284
- sqlite3VdbeAddOp1(v, OP_RealAffinity, pTop->regData+i);
161447
+ int iStorage = pTop->regData + sqlite3TableColumnToStorage(pTab, i);
161448
+ sqlite3VdbeAddOp1(v, OP_RealAffinity, iStorage);
161285
161449
  }
161286
161450
  }
161287
161451
  sqlite3Update(pParse, pSrc, sqlite3ExprListDup(db,pUpsert->pUpsertSet,0),
@@ -161869,6 +162033,7 @@ SQLITE_API int sqlite3_drop_modules(sqlite3 *db, const char** azNames){
161869
162033
  #ifdef SQLITE_ENABLE_API_ARMOR
161870
162034
  if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
161871
162035
  #endif
162036
+ sqlite3_mutex_enter(db->mutex);
161872
162037
  for(pThis=sqliteHashFirst(&db->aModule); pThis; pThis=pNext){
161873
162038
  Module *pMod = (Module*)sqliteHashData(pThis);
161874
162039
  pNext = sqliteHashNext(pThis);
@@ -161879,6 +162044,7 @@ SQLITE_API int sqlite3_drop_modules(sqlite3 *db, const char** azNames){
161879
162044
  }
161880
162045
  createModule(db, pMod->zName, 0, 0, 0);
161881
162046
  }
162047
+ sqlite3_mutex_leave(db->mutex);
161882
162048
  return SQLITE_OK;
161883
162049
  }
161884
162050
 
@@ -167253,7 +167419,10 @@ static void transferJoinMarkings(Expr *pDerived, Expr *pBase){
167253
167419
  static void markTermAsChild(WhereClause *pWC, int iChild, int iParent){
167254
167420
  pWC->a[iChild].iParent = iParent;
167255
167421
  pWC->a[iChild].truthProb = pWC->a[iParent].truthProb;
167422
+ assert( pWC->a[iParent].nChild < UMXV(pWC->a[0].nChild) );
167256
167423
  pWC->a[iParent].nChild++;
167424
+ testcase( pWC->a[iParent].nChild == UMXV(pWC->a[0].nChild) );
167425
+
167257
167426
  }
167258
167427
 
167259
167428
  /*
@@ -168030,6 +168199,7 @@ static void exprAnalyze(
168030
168199
  pList = pExpr->x.pList;
168031
168200
  assert( pList!=0 );
168032
168201
  assert( pList->nExpr==2 );
168202
+ assert( pWC->a[idxTerm].nChild==0 );
168033
168203
  for(i=0; i<2; i++){
168034
168204
  Expr *pNewExpr;
168035
168205
  int idxNew;
@@ -168240,8 +168410,11 @@ static void exprAnalyze(
168240
168410
  && pExpr->x.pSelect->pWin==0
168241
168411
  #endif
168242
168412
  && pWC->op==TK_AND
168413
+ && pExpr->x.pSelect->pEList->nExpr <= UMXV(pTerm->nChild)
168414
+ /* ^-- See bug 2026-06-04T10:00:49Z */
168243
168415
  ){
168244
168416
  int i;
168417
+ assert( pTerm->nChild==0 );
168245
168418
  for(i=0; i<sqlite3ExprVectorSize(pExpr->pLeft); i++){
168246
168419
  int idxNew;
168247
168420
  idxNew = whereClauseInsert(pWC, pExpr, TERM_VIRTUAL|TERM_SLICE);
@@ -176791,7 +176964,7 @@ static void nth_valueStepFunc(
176791
176964
  break;
176792
176965
  case SQLITE_FLOAT: {
176793
176966
  double fVal = sqlite3_value_double(apArg[1]);
176794
- if( ((i64)fVal)!=fVal ) goto error_out;
176967
+ if( sqlite3RealToI64(fVal)!=fVal ) goto error_out;
176795
176968
  iVal = (i64)fVal;
176796
176969
  break;
176797
176970
  }
@@ -188328,13 +188501,17 @@ static int nocaseCollatingFunc(
188328
188501
  ** Return the ROWID of the most recent insert
188329
188502
  */
188330
188503
  SQLITE_API sqlite_int64 sqlite3_last_insert_rowid(sqlite3 *db){
188504
+ i64 iRet;
188331
188505
  #ifdef SQLITE_ENABLE_API_ARMOR
188332
188506
  if( !sqlite3SafetyCheckOk(db) ){
188333
188507
  (void)SQLITE_MISUSE_BKPT;
188334
188508
  return 0;
188335
188509
  }
188336
188510
  #endif
188337
- return db->lastRowid;
188511
+ sqlite3_mutex_enter(db->mutex);
188512
+ iRet = db->lastRowid;
188513
+ sqlite3_mutex_leave(db->mutex);
188514
+ return iRet;
188338
188515
  }
188339
188516
 
188340
188517
  /*
@@ -188356,13 +188533,17 @@ SQLITE_API void sqlite3_set_last_insert_rowid(sqlite3 *db, sqlite3_int64 iRowid)
188356
188533
  ** Return the number of changes in the most recent call to sqlite3_exec().
188357
188534
  */
188358
188535
  SQLITE_API sqlite3_int64 sqlite3_changes64(sqlite3 *db){
188536
+ i64 iRet;
188359
188537
  #ifdef SQLITE_ENABLE_API_ARMOR
188360
188538
  if( !sqlite3SafetyCheckOk(db) ){
188361
188539
  (void)SQLITE_MISUSE_BKPT;
188362
188540
  return 0;
188363
188541
  }
188364
188542
  #endif
188365
- return db->nChange;
188543
+ sqlite3_mutex_enter(db->mutex);
188544
+ iRet = db->nChange;
188545
+ sqlite3_mutex_leave(db->mutex);
188546
+ return iRet;
188366
188547
  }
188367
188548
  SQLITE_API int sqlite3_changes(sqlite3 *db){
188368
188549
  return (int)sqlite3_changes64(db);
@@ -188372,13 +188553,17 @@ SQLITE_API int sqlite3_changes(sqlite3 *db){
188372
188553
  ** Return the number of changes since the database handle was opened.
188373
188554
  */
188374
188555
  SQLITE_API sqlite3_int64 sqlite3_total_changes64(sqlite3 *db){
188556
+ i64 iRet;
188375
188557
  #ifdef SQLITE_ENABLE_API_ARMOR
188376
188558
  if( !sqlite3SafetyCheckOk(db) ){
188377
188559
  (void)SQLITE_MISUSE_BKPT;
188378
188560
  return 0;
188379
188561
  }
188380
188562
  #endif
188381
- return db->nTotalChange;
188563
+ sqlite3_mutex_enter(db->mutex);
188564
+ iRet = db->nTotalChange;
188565
+ sqlite3_mutex_leave(db->mutex);
188566
+ return iRet;
188382
188567
  }
188383
188568
  SQLITE_API int sqlite3_total_changes(sqlite3 *db){
188384
188569
  return (int)sqlite3_total_changes64(db);
@@ -189061,6 +189246,7 @@ SQLITE_API int sqlite3_busy_timeout(sqlite3 *db, int ms){
189061
189246
  #ifdef SQLITE_ENABLE_API_ARMOR
189062
189247
  if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
189063
189248
  #endif
189249
+ sqlite3_mutex_enter(db->mutex);
189064
189250
  if( ms>0 ){
189065
189251
  sqlite3_busy_handler(db, (int(*)(void*,int))sqliteDefaultBusyCallback,
189066
189252
  (void*)db);
@@ -189071,6 +189257,7 @@ SQLITE_API int sqlite3_busy_timeout(sqlite3 *db, int ms){
189071
189257
  }else{
189072
189258
  sqlite3_busy_handler(db, 0, 0);
189073
189259
  }
189260
+ sqlite3_mutex_leave(db->mutex);
189074
189261
  return SQLITE_OK;
189075
189262
  }
189076
189263
 
@@ -189976,9 +190163,11 @@ SQLITE_API int sqlite3_set_errmsg(sqlite3 *db, int errcode, const char *zMsg){
189976
190163
  */
189977
190164
  SQLITE_API int sqlite3_error_offset(sqlite3 *db){
189978
190165
  int iOffset = -1;
189979
- if( db && sqlite3SafetyCheckSickOrOk(db) && db->errCode ){
190166
+ if( db && sqlite3SafetyCheckSickOrOk(db) ){
189980
190167
  sqlite3_mutex_enter(db->mutex);
189981
- iOffset = db->errByteOffset;
190168
+ if( db->errCode ){
190169
+ iOffset = db->errByteOffset;
190170
+ }
189982
190171
  sqlite3_mutex_leave(db->mutex);
189983
190172
  }
189984
190173
  return iOffset;
@@ -190032,25 +190221,43 @@ SQLITE_API const void *sqlite3_errmsg16(sqlite3 *db){
190032
190221
  ** passed to this function, we assume a malloc() failed during sqlite3_open().
190033
190222
  */
190034
190223
  SQLITE_API int sqlite3_errcode(sqlite3 *db){
190035
- if( db && !sqlite3SafetyCheckSickOrOk(db) ){
190224
+ int iRet;
190225
+ if( !db ) return SQLITE_NOMEM_BKPT;
190226
+ if( !sqlite3SafetyCheckSickOrOk(db) ){
190036
190227
  return SQLITE_MISUSE_BKPT;
190037
190228
  }
190038
- if( !db || db->mallocFailed ){
190039
- return SQLITE_NOMEM_BKPT;
190229
+ sqlite3_mutex_enter(db->mutex);
190230
+ if( db->mallocFailed ){
190231
+ iRet = SQLITE_NOMEM_BKPT;
190232
+ }else{
190233
+ iRet = db->errCode & db->errMask;
190040
190234
  }
190041
- return db->errCode & db->errMask;
190235
+ sqlite3_mutex_leave(db->mutex);
190236
+ return iRet;
190042
190237
  }
190043
190238
  SQLITE_API int sqlite3_extended_errcode(sqlite3 *db){
190044
- if( db && !sqlite3SafetyCheckSickOrOk(db) ){
190239
+ int iRet;
190240
+ if( !db ) return SQLITE_NOMEM_BKPT;
190241
+ if( !sqlite3SafetyCheckSickOrOk(db) ){
190045
190242
  return SQLITE_MISUSE_BKPT;
190046
190243
  }
190047
- if( !db || db->mallocFailed ){
190048
- return SQLITE_NOMEM_BKPT;
190244
+ sqlite3_mutex_enter(db->mutex);
190245
+ if( db->mallocFailed ){
190246
+ iRet = SQLITE_NOMEM_BKPT;
190247
+ }else{
190248
+ iRet = db->errCode;
190049
190249
  }
190050
- return db->errCode;
190250
+ sqlite3_mutex_leave(db->mutex);
190251
+ return iRet;
190051
190252
  }
190052
190253
  SQLITE_API int sqlite3_system_errno(sqlite3 *db){
190053
- return db ? db->iSysErrno : 0;
190254
+ int iRet = 0;
190255
+ if( db ){
190256
+ sqlite3_mutex_enter(db->mutex);
190257
+ iRet = db->iSysErrno;
190258
+ sqlite3_mutex_leave(db->mutex);
190259
+ }
190260
+ return iRet;
190054
190261
  }
190055
190262
 
190056
190263
  /*
@@ -190245,6 +190452,7 @@ SQLITE_API int sqlite3_limit(sqlite3 *db, int limitId, int newLimit){
190245
190452
  if( limitId<0 || limitId>=SQLITE_N_LIMIT ){
190246
190453
  return -1;
190247
190454
  }
190455
+ sqlite3_mutex_enter(db->mutex);
190248
190456
  oldLimit = db->aLimit[limitId];
190249
190457
  if( newLimit>=0 ){ /* IMP: R-52476-28732 */
190250
190458
  if( newLimit>aHardLimit[limitId] ){
@@ -190254,6 +190462,7 @@ SQLITE_API int sqlite3_limit(sqlite3 *db, int limitId, int newLimit){
190254
190462
  }
190255
190463
  db->aLimit[limitId] = newLimit;
190256
190464
  }
190465
+ sqlite3_mutex_leave(db->mutex);
190257
190466
  return oldLimit; /* IMP: R-53341-35419 */
190258
190467
  }
190259
190468
 
@@ -190296,7 +190505,7 @@ SQLITE_PRIVATE int sqlite3ParseUri(
190296
190505
  const char *zVfs = zDefaultVfs;
190297
190506
  char *zFile;
190298
190507
  char c;
190299
- int nUri = sqlite3Strlen30(zUri);
190508
+ i64 nUri = strlen(zUri);
190300
190509
 
190301
190510
  assert( *pzErrMsg==0 );
190302
190511
 
@@ -190306,8 +190515,8 @@ SQLITE_PRIVATE int sqlite3ParseUri(
190306
190515
  ){
190307
190516
  char *zOpt;
190308
190517
  int eState; /* Parser state when parsing URI */
190309
- int iIn; /* Input character index */
190310
- int iOut = 0; /* Output character index */
190518
+ i64 iIn; /* Input character index */
190519
+ i64 iOut = 0; /* Output character index */
190311
190520
  u64 nByte = nUri+8; /* Bytes of space to allocate */
190312
190521
 
190313
190522
  /* Make sure the SQLITE_OPEN_URI flag is set to indicate to the VFS xOpen
@@ -190341,7 +190550,7 @@ SQLITE_PRIVATE int sqlite3ParseUri(
190341
190550
  while( zUri[iIn] && zUri[iIn]!='/' ) iIn++;
190342
190551
  if( iIn!=7 && (iIn!=16 || memcmp("localhost", &zUri[7], 9)) ){
190343
190552
  *pzErrMsg = sqlite3_mprintf("invalid uri authority: %.*s",
190344
- iIn-7, &zUri[7]);
190553
+ (int)(iIn-7), &zUri[7]);
190345
190554
  rc = SQLITE_ERROR;
190346
190555
  goto parse_uri_out;
190347
190556
  }
@@ -190416,11 +190625,11 @@ SQLITE_PRIVATE int sqlite3ParseUri(
190416
190625
  ** here. Options that are interpreted here include "vfs" and those that
190417
190626
  ** correspond to flags that may be passed to the sqlite3_open_v2()
190418
190627
  ** method. */
190419
- zOpt = &zFile[sqlite3Strlen30(zFile)+1];
190628
+ zOpt = &zFile[strlen(zFile)+1];
190420
190629
  while( zOpt[0] ){
190421
- int nOpt = sqlite3Strlen30(zOpt);
190630
+ i64 nOpt = strlen(zOpt);
190422
190631
  char *zVal = &zOpt[nOpt+1];
190423
- int nVal = sqlite3Strlen30(zVal);
190632
+ i64 nVal = strlen(zVal);
190424
190633
 
190425
190634
  if( nOpt==3 && memcmp("vfs", zOpt, 3)==0 ){
190426
190635
  zVfs = zVal;
@@ -190466,7 +190675,7 @@ SQLITE_PRIVATE int sqlite3ParseUri(
190466
190675
  int mode = 0;
190467
190676
  for(i=0; aMode[i].z; i++){
190468
190677
  const char *z = aMode[i].z;
190469
- if( nVal==sqlite3Strlen30(z) && 0==memcmp(zVal, z, nVal) ){
190678
+ if( nVal==(i64)strlen(z) && 0==memcmp(zVal, z, nVal) ){
190470
190679
  mode = aMode[i].mode;
190471
190680
  break;
190472
190681
  }
@@ -191151,13 +191360,17 @@ SQLITE_API int sqlite3_global_recover(void){
191151
191360
  ** by the next COMMIT or ROLLBACK.
191152
191361
  */
191153
191362
  SQLITE_API int sqlite3_get_autocommit(sqlite3 *db){
191363
+ int iRet;
191154
191364
  #ifdef SQLITE_ENABLE_API_ARMOR
191155
191365
  if( !sqlite3SafetyCheckOk(db) ){
191156
191366
  (void)SQLITE_MISUSE_BKPT;
191157
191367
  return 0;
191158
191368
  }
191159
191369
  #endif
191160
- return db->autoCommit;
191370
+ sqlite3_mutex_enter(db->mutex);
191371
+ iRet = db->autoCommit;
191372
+ sqlite3_mutex_leave(db->mutex);
191373
+ return iRet;
191161
191374
  }
191162
191375
 
191163
191376
  /*
@@ -192182,17 +192395,19 @@ SQLITE_PRIVATE Btree *sqlite3DbNameToBtree(sqlite3 *db, const char *zDbName){
192182
192395
  ** of range.
192183
192396
  */
192184
192397
  SQLITE_API const char *sqlite3_db_name(sqlite3 *db, int N){
192398
+ const char *zRet = 0;
192185
192399
  #ifdef SQLITE_ENABLE_API_ARMOR
192186
192400
  if( !sqlite3SafetyCheckOk(db) ){
192187
192401
  (void)SQLITE_MISUSE_BKPT;
192188
192402
  return 0;
192189
192403
  }
192190
192404
  #endif
192191
- if( N<0 || N>=db->nDb ){
192192
- return 0;
192193
- }else{
192194
- return db->aDb[N].zDbSName;
192405
+ sqlite3_mutex_enter(db->mutex);
192406
+ if( N>=0 && N<db->nDb ){
192407
+ zRet = db->aDb[N].zDbSName;
192195
192408
  }
192409
+ sqlite3_mutex_leave(db->mutex);
192410
+ return zRet;
192196
192411
  }
192197
192412
 
192198
192413
  /*
@@ -195814,8 +196029,13 @@ static void fts3PutDeltaVarint(
195814
196029
  sqlite3_int64 iVal /* Write this value to the list */
195815
196030
  ){
195816
196031
  assert_fts3_nc( iVal-*piPrev > 0 || (*piPrev==0 && iVal==0) );
195817
- *pp += sqlite3Fts3PutVarint(*pp, iVal-*piPrev);
195818
- *piPrev = iVal;
196032
+ if( iVal-(*piPrev)>=0 ){
196033
+ /* Refuse to write a negative delta integer. This only happens with a
196034
+ ** corrupt db (see the assert above) and can cause buffer overwrites
196035
+ ** in some cases. */
196036
+ *pp += sqlite3Fts3PutVarint(*pp, iVal-*piPrev);
196037
+ *piPrev = iVal;
196038
+ }
195819
196039
  }
195820
196040
 
195821
196041
  /*
@@ -198169,6 +198389,7 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
198169
198389
  char *p1;
198170
198390
  char *p2;
198171
198391
  char *aOut;
198392
+ i64 nAlloc = (i64)nPoslist*2 + FTS3_BUFFER_PADDING;
198172
198393
 
198173
198394
  if( nMaxUndeferred>iPrev ){
198174
198395
  p1 = aPoslist;
@@ -198180,7 +198401,7 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
198180
198401
  nDistance = iPrev - nMaxUndeferred;
198181
198402
  }
198182
198403
 
198183
- aOut = (char *)sqlite3Fts3MallocZero(((i64)nPoslist)+FTS3_BUFFER_PADDING);
198404
+ aOut = (char *)sqlite3Fts3MallocZero(nAlloc);
198184
198405
  if( !aOut ){
198185
198406
  sqlite3_free(aPoslist);
198186
198407
  return SQLITE_NOMEM;
@@ -207235,6 +207456,10 @@ static void fts3ReadEndBlockField(
207235
207456
  for(/* no-op */; zText[i]>='0' && zText[i]<='9'; i++){
207236
207457
  iVal = iVal*10 + (zText[i] - '0');
207237
207458
  }
207459
+
207460
+ /* This if() clause is just to avoid an integer overflow. The record is
207461
+ ** corrupt in this case. */
207462
+ if( (i64)iVal==SMALLEST_INT64 ) iMul = 1;
207238
207463
  *pnByte = ((i64)iVal * (i64)iMul);
207239
207464
  }
207240
207465
  }
@@ -208461,7 +208686,7 @@ static int fts3IncrmergeLoad(
208461
208686
  return FTS_CORRUPT_VTAB;
208462
208687
  }
208463
208688
 
208464
- pWriter->nLeafEst = (int)((iEnd - iStart) + 1)/FTS_MAX_APPENDABLE_HEIGHT;
208689
+ pWriter->nLeafEst = (int)(((iEnd - iStart)+1)/FTS_MAX_APPENDABLE_HEIGHT);
208465
208690
  pWriter->iStart = iStart;
208466
208691
  pWriter->iEnd = iEnd;
208467
208692
  pWriter->iAbsLevel = iAbsLevel;
@@ -210579,8 +210804,8 @@ static int fts3StringAppend(
210579
210804
  ** to grow the buffer until so that it is big enough to accommodate the
210580
210805
  ** appended data.
210581
210806
  */
210582
- if( pStr->n+nAppend+1>=pStr->nAlloc ){
210583
- sqlite3_int64 nAlloc = pStr->nAlloc+(sqlite3_int64)nAppend+100;
210807
+ if( (i64)pStr->n+(i64)nAppend+1>=(i64)pStr->nAlloc ){
210808
+ i64 nAlloc = pStr->nAlloc+(i64)nAppend+100;
210584
210809
  char *zNew = sqlite3_realloc64(pStr->z, nAlloc);
210585
210810
  if( !zNew ){
210586
210811
  return SQLITE_NOMEM;
@@ -214784,7 +215009,8 @@ static u32 jsonTranslateBlobToText(
214784
215009
  if( sz==0 ) goto malformed_jsonb;
214785
215010
  if( zIn[0]=='-' ){
214786
215011
  jsonAppendChar(pOut, '-');
214787
- k++;
215012
+ if( sz<=1 ) goto malformed_jsonb;
215013
+ k = 1;
214788
215014
  }
214789
215015
  if( zIn[k]=='.' ){
214790
215016
  jsonAppendChar(pOut, '0');
@@ -217748,7 +217974,9 @@ static int jsonSkipLabel(JsonEachCursor *p){
217748
217974
  if( p->eType==JSONB_OBJECT ){
217749
217975
  u32 sz = 0;
217750
217976
  u32 n = jsonbPayloadSize(&p->sParse, p->i, &sz);
217751
- return p->i + n + sz;
217977
+ sz += p->i + n;
217978
+ if( sz >= p->sParse.nBlob ) sz = p->i;
217979
+ return sz;
217752
217980
  }else{
217753
217981
  return p->i;
217754
217982
  }
@@ -218575,7 +218803,7 @@ struct RtreeCursor {
218575
218803
  sqlite3_stmt *pReadAux; /* Statement to read aux-data */
218576
218804
  RtreeSearchPoint sPoint; /* Cached next search point */
218577
218805
  RtreeNode *aNode[RTREE_CACHE_SZ]; /* Rtree node cache */
218578
- u32 anQueue[RTREE_MAX_DEPTH+1]; /* Number of queued entries by iLevel */
218806
+ u32 anQueue[RTREE_MAX_DEPTH+2]; /* Number of queued entries by iLevel */
218579
218807
  };
218580
218808
 
218581
218809
  /* Return the Rtree of a RtreeCursor */
@@ -219030,6 +219258,9 @@ static int nodeAcquire(
219030
219258
  rc = SQLITE_CORRUPT_VTAB;
219031
219259
  RTREE_IS_CORRUPT(pRtree);
219032
219260
  }
219261
+ }else if( iNode<=0 ){
219262
+ RTREE_IS_CORRUPT(pRtree);
219263
+ rc = SQLITE_CORRUPT_VTAB;
219033
219264
  }else if( pRtree->iNodeSize==sqlite3_blob_bytes(pRtree->pNodeBlob) ){
219034
219265
  pNode = (RtreeNode *)sqlite3_malloc64(sizeof(RtreeNode)+pRtree->iNodeSize);
219035
219266
  if( !pNode ){
@@ -219055,7 +219286,7 @@ static int nodeAcquire(
219055
219286
  */
219056
219287
  if( rc==SQLITE_OK && pNode && iNode==1 ){
219057
219288
  pRtree->iDepth = readInt16(pNode->zData);
219058
- if( pRtree->iDepth>RTREE_MAX_DEPTH ){
219289
+ if( pRtree->iDepth>=RTREE_MAX_DEPTH ){
219059
219290
  rc = SQLITE_CORRUPT_VTAB;
219060
219291
  RTREE_IS_CORRUPT(pRtree);
219061
219292
  }
@@ -226618,16 +226849,26 @@ static unsigned int rbuDeltaGetInt(const char **pz, int *pLen){
226618
226849
  25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, 36,
226619
226850
  -1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
226620
226851
  52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, -1, -1, -1, 63, -1,
226852
+
226853
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
226854
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
226855
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
226856
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
226857
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
226858
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
226859
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
226860
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
226621
226861
  };
226622
226862
  unsigned int v = 0;
226623
226863
  int c;
226624
226864
  unsigned char *z = (unsigned char*)*pz;
226625
- unsigned char *zStart = z;
226626
- while( (c = zValue[0x7f&*(z++)])>=0 ){
226627
- v = (v<<6) + c;
226865
+ unsigned char *zEnd = z + (*pLen);
226866
+ while( z<zEnd && (c = zValue[*z])>=0 ){
226867
+ v = (v<<6) + c;
226868
+ z++;
226628
226869
  }
226629
- z--;
226630
- *pLen -= (int)(z - zStart);
226870
+
226871
+ *pLen -= (int)(z - (unsigned char*)*pz);
226631
226872
  *pz = (char*)z;
226632
226873
  return v;
226633
226874
  }
@@ -226696,21 +226937,22 @@ static int rbuDeltaApply(
226696
226937
  int lenDelta, /* Length of the delta */
226697
226938
  char *zOut /* Write the output into this preallocated buffer */
226698
226939
  ){
226699
- unsigned int limit;
226700
- unsigned int total = 0;
226940
+ sqlite3_uint64 limit;
226941
+ sqlite3_uint64 total = 0;
226701
226942
  #if RBU_ENABLE_DELTA_CKSUM
226702
226943
  char *zOrigOut = zOut;
226703
226944
  #endif
226704
226945
 
226705
226946
  limit = rbuDeltaGetInt(&zDelta, &lenDelta);
226706
- if( *zDelta!='\n' ){
226947
+ if( lenDelta<=0 || *zDelta!='\n' ){
226707
226948
  /* ERROR: size integer not terminated by "\n" */
226708
226949
  return -1;
226709
226950
  }
226710
- zDelta++; lenDelta--;
226711
- while( *zDelta && lenDelta>0 ){
226951
+ zDelta++; lenDelta--; /* Skip the \n */
226952
+ while( lenDelta>0 && zDelta[0] ){
226712
226953
  unsigned int cnt, ofst;
226713
226954
  cnt = rbuDeltaGetInt(&zDelta, &lenDelta);
226955
+ if( lenDelta<=0 ) return -1;
226714
226956
  switch( zDelta[0] ){
226715
226957
  case '@': {
226716
226958
  zDelta++; lenDelta--;
@@ -226740,7 +226982,7 @@ static int rbuDeltaApply(
226740
226982
  /* ERROR: insert command gives an output larger than predicted */
226741
226983
  return -1;
226742
226984
  }
226743
- if( (int)cnt>lenDelta ){
226985
+ if( cnt>lenDelta ){
226744
226986
  /* ERROR: insert count exceeds size of delta */
226745
226987
  return -1;
226746
226988
  }
@@ -226778,7 +227020,7 @@ static int rbuDeltaApply(
226778
227020
  static int rbuDeltaOutputSize(const char *zDelta, int lenDelta){
226779
227021
  int size;
226780
227022
  size = rbuDeltaGetInt(&zDelta, &lenDelta);
226781
- if( *zDelta!='\n' ){
227023
+ if( lenDelta<=0 || *zDelta!='\n' ){
226782
227024
  /* ERROR: size integer not terminated by "\n" */
226783
227025
  return -1;
226784
227026
  }
@@ -226826,7 +227068,7 @@ static void rbuFossilDeltaFunc(
226826
227068
  return;
226827
227069
  }
226828
227070
 
226829
- aOut = sqlite3_malloc(nOut+1);
227071
+ aOut = sqlite3_malloc64((i64)nOut+1);
226830
227072
  if( aOut==0 ){
226831
227073
  sqlite3_result_error_nomem(context);
226832
227074
  }else{
@@ -228753,13 +228995,13 @@ static int rbuGetUpdateStmt(
228753
228995
  char *zUpdate = 0;
228754
228996
 
228755
228997
  pUp->zMask = (char*)&pUp[1];
228756
- memcpy(pUp->zMask, zMask, pIter->nTblCol);
228757
228998
  pUp->pNext = pIter->pRbuUpdate;
228758
228999
  pIter->pRbuUpdate = pUp;
228759
229000
 
228760
229001
  if( zSet ){
228761
229002
  const char *zPrefix = "";
228762
-
229003
+ assert( p->rc==SQLITE_OK );
229004
+ memcpy(pUp->zMask, zMask, pIter->nTblCol);
228763
229005
  if( pIter->eType!=RBU_PK_VTAB ) zPrefix = "rbu_imp_";
228764
229006
  zUpdate = sqlite3_mprintf("UPDATE \"%s%w\" SET %s WHERE %s",
228765
229007
  zPrefix, pIter->zTbl, zSet, zWhere
@@ -228849,6 +229091,9 @@ static RbuState *rbuLoadState(sqlite3rbu *p){
228849
229091
 
228850
229092
  case RBU_STATE_ROW:
228851
229093
  pRet->nRow = sqlite3_column_int(pStmt, 1);
229094
+ if( pRet->nRow<0 ){
229095
+ rc = SQLITE_CORRUPT;
229096
+ }
228852
229097
  break;
228853
229098
 
228854
229099
  case RBU_STATE_PROGRESS:
@@ -235005,7 +235250,7 @@ static void sessionAppendStr(
235005
235250
  int *pRc
235006
235251
  ){
235007
235252
  int nStr = sqlite3Strlen30(zStr);
235008
- if( 0==sessionBufferGrow(p, nStr+1, pRc) ){
235253
+ if( 0==sessionBufferGrow(p, (i64)nStr+1, pRc) ){
235009
235254
  memcpy(&p->aBuf[p->nBuf], zStr, nStr);
235010
235255
  p->nBuf += nStr;
235011
235256
  p->aBuf[p->nBuf] = 0x00;
@@ -240085,7 +240330,12 @@ static int sessionChangesetToHash(
240085
240330
 
240086
240331
  pIter->in.bNoDiscard = 1;
240087
240332
  while( SQLITE_ROW==(sessionChangesetNext(pIter, &aRec, &nRec, 0)) ){
240088
- rc = sessionOneChangeIterToHash(pGrp, pIter, bRebase);
240333
+ if( bRebase && pIter->bPatchset ){
240334
+ /* A patchset may not be used as a rebase */
240335
+ rc = SQLITE_ERROR;
240336
+ }else{
240337
+ rc = sessionOneChangeIterToHash(pGrp, pIter, bRebase);
240338
+ }
240089
240339
  if( rc!=SQLITE_OK ) break;
240090
240340
  }
240091
240341
 
@@ -240403,14 +240653,17 @@ static void sessionAppendRecordMerge(
240403
240653
  u8 *a2, int n2, /* Record 2 */
240404
240654
  int *pRc /* IN/OUT: error code */
240405
240655
  ){
240406
- sessionBufferGrow(pBuf, n1+n2, pRc);
240656
+ u8 *a1Eof = &a1[n1];
240657
+ u8 *a2Eof = &a2[n2];
240658
+
240659
+ sessionBufferGrow(pBuf, (i64)n1+n2, pRc);
240407
240660
  if( *pRc==SQLITE_OK ){
240408
240661
  int i;
240409
240662
  u8 *pOut = &pBuf->aBuf[pBuf->nBuf];
240410
240663
  for(i=0; i<nCol; i++){
240411
- int nn1 = sessionSerialLen(a1);
240412
- int nn2 = sessionSerialLen(a2);
240413
- if( *a1==0 || *a1==0xFF ){
240664
+ int nn1 = (a1<a1Eof ? sessionSerialLen(a1) : 0);
240665
+ int nn2 = (a2<a2Eof ? sessionSerialLen(a2) : 0);
240666
+ if( nn1==0 || (nn2>0 && (*a1==0 || *a1==0xFF)) ){
240414
240667
  memcpy(pOut, a2, nn2);
240415
240668
  pOut += nn2;
240416
240669
  }else{
@@ -240452,20 +240705,21 @@ static void sessionAppendPartialUpdate(
240452
240705
  u8 *aChange, int nChange, /* Record to rebase against */
240453
240706
  int *pRc /* IN/OUT: Return Code */
240454
240707
  ){
240455
- sessionBufferGrow(pBuf, 2+nRec+nChange, pRc);
240708
+ sessionBufferGrow(pBuf, (i64)2+nRec+nChange, pRc);
240456
240709
  if( *pRc==SQLITE_OK ){
240457
240710
  int bData = 0;
240458
240711
  u8 *pOut = &pBuf->aBuf[pBuf->nBuf];
240459
240712
  int i;
240460
240713
  u8 *a1 = aRec;
240461
240714
  u8 *a2 = aChange;
240715
+ u8 *a2Eof = &a2[nChange];
240462
240716
 
240463
240717
  *pOut++ = SQLITE_UPDATE;
240464
240718
  *pOut++ = pIter->bIndirect;
240465
240719
  for(i=0; i<pIter->nCol; i++){
240466
240720
  int n1 = sessionSerialLen(a1);
240467
- int n2 = sessionSerialLen(a2);
240468
- if( pIter->abPK[i] || a2[0]==0 ){
240721
+ int n2 = (a2>=a2Eof) ? 0 : sessionSerialLen(a2);
240722
+ if( n2<=0 || pIter->abPK[i] || a2[0]==0 ){
240469
240723
  if( !pIter->abPK[i] && a1[0] ) bData = 1;
240470
240724
  memcpy(pOut, a1, n1);
240471
240725
  pOut += n1;
@@ -240666,8 +240920,8 @@ SQLITE_API int sqlite3rebaser_configure(
240666
240920
  sqlite3_rebaser *p,
240667
240921
  int nRebase, const void *pRebase
240668
240922
  ){
240669
- sqlite3_changeset_iter *pIter = 0; /* Iterator opened on pData/nData */
240670
240923
  int rc; /* Return code */
240924
+ sqlite3_changeset_iter *pIter = 0; /* Iterator opened on pData/nData */
240671
240925
  rc = sqlite3changeset_start(&pIter, nRebase, (void*)pRebase);
240672
240926
  if( rc==SQLITE_OK ){
240673
240927
  rc = sessionChangesetToHash(pIter, &p->grp, 1);
@@ -244792,7 +245046,7 @@ static void fts5SnippetFunction(
244792
245046
  int rc = SQLITE_OK; /* Return code */
244793
245047
  int iCol; /* 1st argument to snippet() */
244794
245048
  const char *zEllips; /* 4th argument to snippet() */
244795
- int nToken; /* 5th argument to snippet() */
245049
+ i64 nToken; /* 5th argument to snippet() */
244796
245050
  int nInst = 0; /* Number of instance matches this row */
244797
245051
  int i; /* Used to iterate through instances */
244798
245052
  int nPhrase; /* Number of phrases in query */
@@ -244817,7 +245071,7 @@ static void fts5SnippetFunction(
244817
245071
  ctx.zClose = fts5ValueToText(apVal[2]);
244818
245072
  ctx.iRangeEnd = -1;
244819
245073
  zEllips = fts5ValueToText(apVal[3]);
244820
- nToken = sqlite3_value_int(apVal[4]);
245074
+ nToken = (int)(MIN( MAX(sqlite3_value_int64(apVal[4]), 0), 64));
244821
245075
 
244822
245076
  iBestCol = (iCol>=0 ? iCol : 0);
244823
245077
  nPhrase = pApi->xPhraseCount(pFts);
@@ -247533,7 +247787,7 @@ static int fts5ExprNearIsMatch(int *pRc, Fts5ExprNearset *pNear){
247533
247787
  i64 iPos = a[i].reader.iPos;
247534
247788
  Fts5PoslistWriter *pWriter = &a[i].writer;
247535
247789
  if( a[i].pOut->n==0 || iPos!=pWriter->iPrev ){
247536
- sqlite3Fts5PoslistWriterAppend(a[i].pOut, pWriter, iPos);
247790
+ sqlite3Fts5PoslistSafeAppend(a[i].pOut, &pWriter->iPrev, iPos);
247537
247791
  }
247538
247792
  }
247539
247793
 
@@ -248484,10 +248738,10 @@ static int fts5ParseTokenize(
248484
248738
  memset(pSyn, 0, (size_t)nByte);
248485
248739
  pSyn->pTerm = ((char*)pSyn) + sizeof(Fts5ExprTerm) + sizeof(Fts5Buffer);
248486
248740
  pSyn->nFullTerm = pSyn->nQueryTerm = nToken;
248741
+ memcpy(pSyn->pTerm, pToken, nToken);
248487
248742
  if( pCtx->pConfig->bTokendata ){
248488
248743
  pSyn->nQueryTerm = (int)strlen(pSyn->pTerm);
248489
248744
  }
248490
- memcpy(pSyn->pTerm, pToken, nToken);
248491
248745
  pSyn->pSynonym = pPhrase->aTerm[pPhrase->nTerm-1].pSynonym;
248492
248746
  pPhrase->aTerm[pPhrase->nTerm-1].pSynonym = pSyn;
248493
248747
  }
@@ -251487,6 +251741,7 @@ static Fts5Data *fts5DataRead(Fts5Index *p, i64 iRowid){
251487
251741
  pRet = (Fts5Data*)sqlite3_malloc64(nAlloc);
251488
251742
  if( pRet ){
251489
251743
  pRet->nn = nByte;
251744
+ pRet->szLeaf = 0;
251490
251745
  aOut = pRet->p = (u8*)pRet + szData;
251491
251746
  }else{
251492
251747
  rc = SQLITE_NOMEM;
@@ -251499,10 +251754,8 @@ static Fts5Data *fts5DataRead(Fts5Index *p, i64 iRowid){
251499
251754
  sqlite3_free(pRet);
251500
251755
  pRet = 0;
251501
251756
  }else{
251502
- /* TODO1: Fix this */
251503
251757
  pRet->p[nByte] = 0x00;
251504
251758
  pRet->p[nByte+1] = 0x00;
251505
- pRet->szLeaf = fts5GetU16(&pRet->p[2]);
251506
251759
  }
251507
251760
  }
251508
251761
  p->rc = rc;
@@ -251523,9 +251776,17 @@ static void fts5DataRelease(Fts5Data *pData){
251523
251776
  sqlite3_free(pData);
251524
251777
  }
251525
251778
 
251779
+ /*
251780
+ ** Read a leaf-page record. This is similar to fts5DataRead(), except that
251781
+ ** it fills in the Fts5Data.szLeaf value before returning.
251782
+ */
251526
251783
  static Fts5Data *fts5LeafRead(Fts5Index *p, i64 iRowid){
251527
251784
  Fts5Data *pRet = fts5DataRead(p, iRowid);
251528
251785
  if( pRet ){
251786
+ assert( pRet->szLeaf==0 );
251787
+ if( pRet->nn>=4 ){
251788
+ pRet->szLeaf = fts5GetU16(&pRet->p[2]);
251789
+ }
251529
251790
  if( pRet->szLeaf<4 || pRet->szLeaf>pRet->nn ){
251530
251791
  FTS5_CORRUPT_ROWID(p, iRowid);
251531
251792
  fts5DataRelease(pRet);
@@ -251770,7 +252031,7 @@ static int fts5StructureDecode(
251770
252031
  i += fts5GetVarint32(&pData[i], nTotal);
251771
252032
  if( nTotal<pLvl->nMerge ) rc = FTS5_CORRUPT;
251772
252033
  pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(&rc,
251773
- nTotal * sizeof(Fts5StructureSegment)
252034
+ (i64)nTotal * sizeof(Fts5StructureSegment)
251774
252035
  );
251775
252036
  nSegment -= nTotal;
251776
252037
  }
@@ -252726,7 +252987,7 @@ static void fts5SegIterReverseNewPage(Fts5Index *p, Fts5SegIter *pIter){
252726
252987
  while( p->rc==SQLITE_OK && pIter->iLeafPgno>pIter->iTermLeafPgno ){
252727
252988
  Fts5Data *pNew;
252728
252989
  pIter->iLeafPgno--;
252729
- pNew = fts5DataRead(p, FTS5_SEGMENT_ROWID(
252990
+ pNew = fts5LeafRead(p, FTS5_SEGMENT_ROWID(
252730
252991
  pIter->pSeg->iSegid, pIter->iLeafPgno
252731
252992
  ));
252732
252993
  if( pNew ){
@@ -253435,6 +253696,10 @@ static void fts5SegIterNextInit(
253435
253696
 
253436
253697
  pIter->iPgidxOff = pIter->pLeaf->szLeaf;
253437
253698
  pIter->iPgidxOff += fts5GetVarint32(&a[pIter->iPgidxOff], iTermOff);
253699
+ if( iTermOff > pIter->pLeaf->szLeaf ){
253700
+ p->rc = FTS5_CORRUPT;
253701
+ return;
253702
+ }
253438
253703
  pIter->iLeafOffset = iTermOff;
253439
253704
  fts5SegIterLoadTerm(p, pIter, 0);
253440
253705
  fts5SegIterLoadNPos(p, pIter);
@@ -255761,7 +256026,7 @@ static void fts5SecureDeleteOverflow(
255761
256026
  int iNext = 0;
255762
256027
  u8 *aPg = 0;
255763
256028
 
255764
- pLeaf = fts5DataRead(p, iRowid);
256029
+ pLeaf = fts5LeafRead(p, iRowid);
255765
256030
  if( pLeaf==0 ) break;
255766
256031
  aPg = pLeaf->p;
255767
256032
 
@@ -255769,7 +256034,7 @@ static void fts5SecureDeleteOverflow(
255769
256034
  if( iNext!=0 ){
255770
256035
  *pbLastInDoclist = 0;
255771
256036
  }
255772
- if( iNext==0 && pLeaf->szLeaf!=pLeaf->nn ){
256037
+ if( iNext==0 && pLeaf->szLeaf<pLeaf->nn ){
255773
256038
  fts5GetVarint32(&aPg[pLeaf->szLeaf], iNext);
255774
256039
  }
255775
256040
 
@@ -256056,7 +256321,7 @@ static void fts5DoSecureDelete(
256056
256321
  /* The entry being removed may be the only position list in
256057
256322
  ** its doclist. */
256058
256323
  for(iPgno=pSeg->iLeafPgno-1; iPgno>pSeg->iTermLeafPgno; iPgno-- ){
256059
- Fts5Data *pPg = fts5DataRead(p, FTS5_SEGMENT_ROWID(iSegid, iPgno));
256324
+ Fts5Data *pPg = fts5LeafRead(p, FTS5_SEGMENT_ROWID(iSegid, iPgno));
256060
256325
  int bEmpty = (pPg && pPg->nn==4);
256061
256326
  fts5DataRelease(pPg);
256062
256327
  if( bEmpty==0 ) break;
@@ -256064,7 +256329,7 @@ static void fts5DoSecureDelete(
256064
256329
 
256065
256330
  if( iPgno==pSeg->iTermLeafPgno ){
256066
256331
  i64 iId = FTS5_SEGMENT_ROWID(iSegid, pSeg->iTermLeafPgno);
256067
- Fts5Data *pTerm = fts5DataRead(p, iId);
256332
+ Fts5Data *pTerm = fts5LeafRead(p, iId);
256068
256333
  if( pTerm && pTerm->szLeaf==pSeg->iTermLeafOffset ){
256069
256334
  u8 *aTermIdx = &pTerm->p[pTerm->szLeaf];
256070
256335
  int nTermIdx = pTerm->nn - pTerm->szLeaf;
@@ -258594,8 +258859,8 @@ static void fts5IndexTombstoneRebuild(
258594
258859
  ){
258595
258860
  const int MINSLOT = 32;
258596
258861
  int nSlotPerPage = MAX(MINSLOT, (p->pConfig->pgsz - 8) / szKey);
258597
- int nSlot = 0; /* Number of slots in each output page */
258598
- int nOut = 0;
258862
+ i64 nSlot = 0; /* Number of slots in each output page */
258863
+ i64 nOut = 0;
258599
258864
 
258600
258865
  /* Figure out how many output pages (nOut) and how many slots per
258601
258866
  ** page (nSlot). There are three possibilities:
@@ -258620,23 +258885,26 @@ static void fts5IndexTombstoneRebuild(
258620
258885
  nSlot = MINSLOT;
258621
258886
  }else if( pSeg->nPgTombstone==1 ){
258622
258887
  /* Case 2. */
258623
- int nElem = (int)fts5GetU32(&pData1->p[4]);
258888
+ u32 nElem = fts5GetU32(&pData1->p[4]);
258624
258889
  assert( pData1 && iPg1==0 );
258625
- nOut = 1;
258626
- nSlot = MAX(nElem*4, MINSLOT);
258627
- if( nSlot>nSlotPerPage ) nOut = 0;
258890
+ if( nElem>((u32)nSlotPerPage/4) ){
258891
+ nOut = 0;
258892
+ }else{
258893
+ nOut = 1;
258894
+ nSlot = MAX((i64)nElem*4, MINSLOT);
258895
+ }
258628
258896
  }
258629
258897
  if( nOut==0 ){
258630
258898
  /* Case 3. */
258631
- nOut = (pSeg->nPgTombstone * 2 + 1);
258899
+ nOut = ((i64)pSeg->nPgTombstone * 2 + 1);
258632
258900
  nSlot = nSlotPerPage;
258633
258901
  }
258634
258902
 
258635
258903
  /* Allocate the required array and output pages */
258636
258904
  while( 1 ){
258637
258905
  int res = 0;
258638
- int ii = 0;
258639
- int szPage = 0;
258906
+ i64 ii = 0;
258907
+ i64 szPage = 0;
258640
258908
  Fts5Data **apOut = 0;
258641
258909
 
258642
258910
  /* Allocate space for the new hash table */
@@ -259013,7 +259281,7 @@ static void fts5IndexIntegrityCheckEmpty(
259013
259281
  /* Now check that the iter.nEmpty leaves following the current leaf
259014
259282
  ** (a) exist and (b) contain no terms. */
259015
259283
  for(i=iFirst; p->rc==SQLITE_OK && i<=iLast; i++){
259016
- Fts5Data *pLeaf = fts5DataRead(p, FTS5_SEGMENT_ROWID(pSeg->iSegid, i));
259284
+ Fts5Data *pLeaf = fts5LeafRead(p, FTS5_SEGMENT_ROWID(pSeg->iSegid, i));
259017
259285
  if( pLeaf ){
259018
259286
  if( !fts5LeafIsTermless(pLeaf)
259019
259287
  || (i>=iNoRowid && 0!=fts5LeafFirstRowidOff(pLeaf))
@@ -259141,9 +259409,13 @@ static void fts5IndexIntegrityCheckSegment(
259141
259409
  FTS5_CORRUPT_ROWID(p, iRow);
259142
259410
  }else{
259143
259411
  iOff += fts5GetVarint32(&pLeaf->p[iOff], nTerm);
259144
- res = fts5Memcmp(&pLeaf->p[iOff], zIdxTerm, MIN(nTerm, nIdxTerm));
259145
- if( res==0 ) res = nTerm - nIdxTerm;
259146
- if( res<0 ) FTS5_CORRUPT_ROWID(p, iRow);
259412
+ if( (i64)iOff+(i64)nTerm>(i64)pLeaf->szLeaf ){
259413
+ FTS5_CORRUPT_ROWID(p, iRow);
259414
+ }else{
259415
+ res = fts5Memcmp(&pLeaf->p[iOff], zIdxTerm, MIN(nTerm, nIdxTerm));
259416
+ if( res==0 ) res = nTerm - nIdxTerm;
259417
+ if( res<0 ) FTS5_CORRUPT_ROWID(p, iRow);
259418
+ }
259147
259419
  }
259148
259420
 
259149
259421
  fts5IntegrityCheckPgidx(p, iRow, pLeaf);
@@ -259174,7 +259446,7 @@ static void fts5IndexIntegrityCheckSegment(
259174
259446
  /* Check any rowid-less pages that occur before the current leaf. */
259175
259447
  for(iPg=iPrevLeaf+1; iPg<fts5DlidxIterPgno(pDlidx); iPg++){
259176
259448
  iKey = FTS5_SEGMENT_ROWID(iSegid, iPg);
259177
- pLeaf = fts5DataRead(p, iKey);
259449
+ pLeaf = fts5LeafRead(p, iKey);
259178
259450
  if( pLeaf ){
259179
259451
  if( fts5LeafFirstRowidOff(pLeaf)!=0 ) FTS5_CORRUPT_ROWID(p, iKey);
259180
259452
  fts5DataRelease(pLeaf);
@@ -259185,7 +259457,7 @@ static void fts5IndexIntegrityCheckSegment(
259185
259457
  /* Check that the leaf page indicated by the iterator really does
259186
259458
  ** contain the rowid suggested by the same. */
259187
259459
  iKey = FTS5_SEGMENT_ROWID(iSegid, iPrevLeaf);
259188
- pLeaf = fts5DataRead(p, iKey);
259460
+ pLeaf = fts5LeafRead(p, iKey);
259189
259461
  if( pLeaf ){
259190
259462
  i64 iRowid;
259191
259463
  int iRowidOff = fts5LeafFirstRowidOff(pLeaf);
@@ -262865,19 +263137,23 @@ static int fts5ApiPhraseFirstColumn(
262865
263137
 
262866
263138
  if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){
262867
263139
  Fts5Sorter *pSorter = pCsr->pSorter;
262868
- int n;
262869
- if( pSorter ){
262870
- int i1 = (iPhrase==0 ? 0 : pSorter->aIdx[iPhrase-1]);
262871
- n = pSorter->aIdx[iPhrase] - i1;
262872
- pIter->a = &pSorter->aPoslist[i1];
263140
+ if( iPhrase<0 || iPhrase>=sqlite3Fts5ExprPhraseCount(pCsr->pExpr) ){
263141
+ rc = SQLITE_RANGE;
262873
263142
  }else{
262874
- rc = sqlite3Fts5ExprPhraseCollist(pCsr->pExpr, iPhrase, &pIter->a, &n);
262875
- }
262876
- if( rc==SQLITE_OK ){
262877
- assert( pIter->a || n==0 );
262878
- pIter->b = (pIter->a ? &pIter->a[n] : 0);
262879
- *piCol = 0;
262880
- fts5ApiPhraseNextColumn(pCtx, pIter, piCol);
263143
+ int n;
263144
+ if( pSorter ){
263145
+ int i1 = (iPhrase==0 ? 0 : pSorter->aIdx[iPhrase-1]);
263146
+ n = pSorter->aIdx[iPhrase] - i1;
263147
+ pIter->a = &pSorter->aPoslist[i1];
263148
+ }else{
263149
+ rc = sqlite3Fts5ExprPhraseCollist(pCsr->pExpr, iPhrase, &pIter->a, &n);
263150
+ }
263151
+ if( rc==SQLITE_OK ){
263152
+ assert( pIter->a || n==0 );
263153
+ pIter->b = (pIter->a ? &pIter->a[n] : 0);
263154
+ *piCol = 0;
263155
+ fts5ApiPhraseNextColumn(pCtx, pIter, piCol);
263156
+ }
262881
263157
  }
262882
263158
  }else{
262883
263159
  int n;
@@ -263785,7 +264061,7 @@ static void fts5SourceIdFunc(
263785
264061
  ){
263786
264062
  assert( nArg==0 );
263787
264063
  UNUSED_PARAM2(nArg, apUnused);
263788
- sqlite3_result_text(pCtx, "fts5: 2026-06-03 19:12:13 d6e03d8c777cfa2d35e3b60d8ec3e0187f3e9f99d8e2ee9cac695fd6fcdf1a24", -1, SQLITE_TRANSIENT);
264064
+ sqlite3_result_text(pCtx, "fts5: 2026-07-24 19:02:57 bf7c7f30031888f4e796e429ab3978879485813aaca6f641c7b33e4e09459bcc", -1, SQLITE_TRANSIENT);
263789
264065
  }
263790
264066
 
263791
264067
  /*
@@ -264427,34 +264703,31 @@ static int sqlite3Fts5StorageOpen(
264427
264703
  if( pConfig->eContent==FTS5_CONTENT_NORMAL
264428
264704
  || pConfig->eContent==FTS5_CONTENT_UNINDEXED
264429
264705
  ){
264430
- int nDefn = 32 + pConfig->nCol*10;
264431
- char *zDefn = sqlite3_malloc64(32 + (sqlite3_int64)pConfig->nCol * 20);
264432
- if( zDefn==0 ){
264433
- rc = SQLITE_NOMEM;
264434
- }else{
264435
- int i;
264436
- int iOff;
264437
- sqlite3_snprintf(nDefn, zDefn, "id INTEGER PRIMARY KEY");
264438
- iOff = (int)strlen(zDefn);
264439
- for(i=0; i<pConfig->nCol; i++){
264440
- if( pConfig->eContent==FTS5_CONTENT_NORMAL
264441
- || pConfig->abUnindexed[i]
264442
- ){
264443
- sqlite3_snprintf(nDefn-iOff, &zDefn[iOff], ", c%d", i);
264444
- iOff += (int)strlen(&zDefn[iOff]);
264445
- }
264706
+ int i = 0;
264707
+ char *zDefn = 0;
264708
+ sqlite3_str *pDefn = sqlite3_str_new(pConfig->db);
264709
+
264710
+ sqlite3_str_appendf(pDefn, "id INTEGER PRIMARY KEY");
264711
+ for(i=0; i<pConfig->nCol; i++){
264712
+ if( pConfig->eContent==FTS5_CONTENT_NORMAL || pConfig->abUnindexed[i] ){
264713
+ sqlite3_str_appendf(pDefn, ", c%d", i);
264446
264714
  }
264447
- if( pConfig->bLocale ){
264448
- for(i=0; i<pConfig->nCol; i++){
264449
- if( pConfig->abUnindexed[i]==0 ){
264450
- sqlite3_snprintf(nDefn-iOff, &zDefn[iOff], ", l%d", i);
264451
- iOff += (int)strlen(&zDefn[iOff]);
264452
- }
264715
+ }
264716
+ if( pConfig->bLocale ){
264717
+ for(i=0; i<pConfig->nCol; i++){
264718
+ if( pConfig->abUnindexed[i]==0 ){
264719
+ sqlite3_str_appendf(pDefn, ", l%d", i);
264453
264720
  }
264454
264721
  }
264722
+ }
264723
+ zDefn = sqlite3_str_finish(pDefn);
264724
+
264725
+ if( zDefn ){
264455
264726
  rc = sqlite3Fts5CreateTable(pConfig, "content", zDefn, 0, pzErr);
264727
+ sqlite3_free(zDefn);
264728
+ }else{
264729
+ rc = SQLITE_NOMEM;
264456
264730
  }
264457
- sqlite3_free(zDefn);
264458
264731
  }
264459
264732
 
264460
264733
  if( rc==SQLITE_OK && pConfig->bColumnsize ){