From: drh <>
Date: Mon, 2 Oct 2023 17:06:28 +0000 (+0000)
Subject: Fix the length of the string in the new concat() and concat_ws() functions.
X-Git-Tag: version-3.44.0~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51e3f7a1c3858a20a3496db9a9b3ca89825736f2;p=thirdparty%2Fsqlite.git

Fix the length of the string in the new concat() and concat_ws() functions.

FossilOrigin-Name: 325243226520376f4a142864ae3fb98866f25bff4dc50a6b648ef98428a7169f
---

diff --git a/manifest b/manifest
index 2f333cb7e0..ec1bdf15fe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sALWAYS()\sfrom\sa\sbranch\sthat\scan\sin\sfact\sbe\sfalse\sfollowing\san\sOOM\nfault.
-D 2023-10-02T15:56:37.362
+C Fix\sthe\slength\sof\sthe\sstring\sin\sthe\snew\sconcat()\sand\sconcat_ws()\sfunctions.
+D 2023-10-02T17:06:28.465
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -663,7 +663,7 @@ F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
 F src/expr.c 8a5045ac7aae5ecebe7236ec05841693b5a0012af70a4d73933333172546c50d
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
-F src/func.c cd41873c29844259e398aace8d621a2274a3b970b0484410071e98489b8f857a
+F src/func.c 490341f0ad2d0a937ce03c9fd3d9396fd3be9b5a6b90228011830b3a7bf0dca2
 F src/global.c 29f56a330ed9d1b5cd9b79ac0ca36f97ac3afc730ff8bfa987b0db9e559d684d
 F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -2122,8 +2122,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 54441039ae3ebe39e42f008f77ce1be117cbda6daeed8b01739ad42a3c1f0754
-R 03d39c2bd65cb3c107b80e6759b94891
+P 3a1feb1c469d3dd50e2558581199b16bfd59b9d5bcb0de5f1a8f0ec30a17b4d1
+R 1612d597de54e1c9956c6bcdc588fe33
 U drh
-Z f222c844cfd76eaa67420178c722b5b4
+Z 2af91933ac5e23ad24b4f2c2921203ef
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 98c9db8b9a..a066e7c939 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3a1feb1c469d3dd50e2558581199b16bfd59b9d5bcb0de5f1a8f0ec30a17b4d1
\ No newline at end of file
+325243226520376f4a142864ae3fb98866f25bff4dc50a6b648ef98428a7169f
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 3419543b61..dcf195f983 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1592,7 +1592,7 @@ static void concatFuncCore(
   }
   z[j] = 0;
   assert( j<=n );
-  sqlite3_result_text64(context, z, n, sqlite3_free, SQLITE_UTF8);
+  sqlite3_result_text64(context, z, j, sqlite3_free, SQLITE_UTF8);
 }
 
 /*