From: dan <Dan Kennedy>
Date: Thu, 27 Oct 2022 11:25:08 +0000 (+0000)
Subject: Do not use sqlite3_result_text16() in the recover extension if SQLITE_OMIT_UTF16... 
X-Git-Tag: version-3.40.0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=340b1d1a710ca5d8a503b0524c88abcf73083afe;p=thirdparty%2Fsqlite.git

Do not use sqlite3_result_text16() in the recover extension if SQLITE_OMIT_UTF16 is defined.

FossilOrigin-Name: 3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
---

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index 2c297e086c..c92db0c66c 100644
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -466,12 +466,14 @@ static void dbdataValue(
         int n = ((eType-12) / 2);
         if( eType % 2 ){
           switch( enc ){
+#ifndef SQLITE_OMIT_UTF16
             case SQLITE_UTF16BE:
               sqlite3_result_text16be(pCtx, (void*)pData, n, SQLITE_TRANSIENT);
               break;
             case SQLITE_UTF16LE:
               sqlite3_result_text16le(pCtx, (void*)pData, n, SQLITE_TRANSIENT);
               break;
+#endif
             default:
               sqlite3_result_text(pCtx, (char*)pData, n, SQLITE_TRANSIENT);
               break;
diff --git a/manifest b/manifest
index a8a40591c9..9e692e12ba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\srunning\s".recover"\son\san\sin-memory\sdatabase.
-D 2022-10-27T11:12:54.318
+C Do\snot\suse\ssqlite3_result_text16()\sin\sthe\srecover\sextension\sif\sSQLITE_OMIT_UTF16\sis\sdefined.
+D 2022-10-27T11:25:08.538
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,7 +385,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c a7b2fc6750139a7bb3455d784063d43f98c28f226b7f84d88270f1c083dc6b72
+F ext/recover/dbdata.c e2cb4c88ba97a1617d78fe2d8adfde7b3e5ad8bca902b691938e5cc0bae92e2d
 F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
@@ -2052,8 +2052,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 cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890
-R 0b3eaef812138ac59816127d76cc1fa8
+P 87b4cca2b84845cee603d40fbf16c9635d6dc2d19d2f37ae86abfeff716c9a85
+R 1191358d3125d3ef7c1b475e54a08f91
 U dan
-Z 1810ee577f2015d8abedf9ca1b5465fa
+Z 95755cf8ea251206d6850b6a2278f09f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dc80392c1a..4f6d94ef1f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87b4cca2b84845cee603d40fbf16c9635d6dc2d19d2f37ae86abfeff716c9a85
\ No newline at end of file
+3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
\ No newline at end of file