From: drh <>
Date: Wed, 2 Feb 2022 15:10:45 +0000 (+0000)
Subject: Be sure that sqlite3_vtab_in_first() and _next() set the correct encoding.
X-Git-Tag: version-3.38.0~65^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38d1e443501f41f895c34a38dfa247d2ec6d4359;p=thirdparty%2Fsqlite.git

Be sure that sqlite3_vtab_in_first() and _next() set the correct encoding.

FossilOrigin-Name: 04edf36ee8e043c83235a5169a7ced23f211edd2f7ef3290d96413d5fd229ad7
---

diff --git a/manifest b/manifest
index 225a935344..1ec679a8f9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\ssqlite3_vtab_in()\sto\smake\suse\sof\sthe\sexisting\nsqlite3_value_pointer()\smechanism\sfor\spassing\sthe\slist\sof\sIN\soperator\nRHS\svalues\sinto\sxFilter,\sfor\simproved\smemory\ssafety.
-D 2022-02-02T14:36:58.288
+C Be\ssure\sthat\ssqlite3_vtab_in_first()\sand\s_next()\sset\sthe\scorrect\sencoding.
+D 2022-02-02T15:10:45.512
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -627,7 +627,7 @@ F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
 F src/vdbe.c 13a4de20ee07bdfb3dc74ab49b7912208e309caf762a8d1678fb111e2223af35
 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 F src/vdbeInt.h b45599a2b59f1ce042512ab6786b0b82a8cf3002f6b0fa60b4834e2cd3ac61d8
-F src/vdbeapi.c a6ae9ef8180b2c51555cc96b8c5b928d45738a90f667a28a1959bcd09646643d
+F src/vdbeapi.c 32d353cec191cd3e3d3c3457dd219ce10f43d430d9ccb9649abca81f5f622031
 F src/vdbeaux.c e761b8011baec7a4773f0a7594783f2cd71f699ab187c4aad917529ab8acd3fe
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c eb6042667c02c3ef1f968235b4a170e31b23a4b6a57f65a8454eab4d36f14b7f
@@ -1942,8 +1942,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 75040183b8e14f20bfedfdcc1a9fb968f2f0193bc698605d1b4791a3699b93d9
-R 685a004fac313bda3614fce6fec3f1d8
+P 8965929be236fe1a6994f31b94c1b7590c7c1e809470c542a76f3e0e275d032f
+R 577d7ced4e44dba6062d7cb550bb1c26
 U drh
-Z f2a69210d29b19f1b295e7a7f5450a22
+Z d0000616f45072bd895fd0e1857966da
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 55846307b1..c4199e1bff 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8965929be236fe1a6994f31b94c1b7590c7c1e809470c542a76f3e0e275d032f
\ No newline at end of file
+04edf36ee8e043c83235a5169a7ced23f211edd2f7ef3290d96413d5fd229ad7
\ No newline at end of file
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 75d7bf15ce..95fb72c3c9 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -881,6 +881,7 @@ static int valueFromValueList(
       sqlite3_value *pOut = pRhs->pOut;
       int iOff = 1 + getVarint32(&zBuf[1], iSerial);
       sqlite3VdbeSerialGet(&zBuf[iOff], iSerial, pOut);
+      pOut->enc = ENC(pOut->db);
       if( (pOut->flags & MEM_Ephem)!=0 && sqlite3VdbeMemMakeWriteable(pOut) ){
         rc = SQLITE_NOMEM;
       }else{