Restore the trunk version of sqlite3_user_data(). Fix the xColumn for virtual

tables so that the sqlite3_context contains a valid but NULL user data pointer.

FossilOrigin-Name: 15ffd932fecc82a5791b2024f55d2ec80887e8eb7345de68d6f5cac4912cfbe8

diff --git a/manifest b/manifest
index 668f82b009af0898f48dacebfcb74f2f8a995340..c46034ef3b4830cf112db905a833fe1bc0becd90 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Finish\sadding\sjsonb_\sversions\sfor\sall\sJSON\sroutines\sthat\sreturn\sJSON\stext.
-D 2023-09-30T14:34:39.518
+C Restore\sthe\strunk\sversion\sof\ssqlite3_user_data().\s\sFix\sthe\sxColumn\sfor\svirtual\ntables\sso\sthat\sthe\ssqlite3_context\scontains\sa\svalid\sbut\sNULL\suser\sdata\spointer.
+D 2023-09-30T16:50:17.069
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -780,10 +780,10 @@ F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c e87f66258c37f87724f46e849572c3ece4c74ef5614ba41eb221e98f0dbc95de
 F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
-F src/vdbe.c cd112eb00d20fc5cc44f631d0e713838602637328b0f127c2f3c2aa8cea3cc91
+F src/vdbe.c 03e66cfa55542c3ae089a1926d06459f8d67cdbad9d52ddc8a7559b7505e90f7
 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
-F src/vdbeapi.c 7fdd1eec6b967a5455ccc45a43b84fd32746d6749a423104333f9ba5cec56c9f
+F src/vdbeapi.c b82f465cfaa77cf88c414bc53cb8515523e6840956283cfc7e8d284f72640735
 F src/vdbeaux.c 5b415e09b5b9d5be6c0f4fcbf18ea9d7d16f6a29ced2f14a3b2041020f63e9c1
 F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce
 F src/vdbemem.c 317b9f48708139db6239ade40c7980b4bc8233168383690d588dad6d8437f722
@@ -2123,8 +2123,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 bb5e50ff56dff95d954aacdd4c5461790f953cef8d7b89da000d8d587fcdf9b8
-R 29e50b8d59965f3c05293a631078e5bd
+P 6daa7b69695e1b68dba317abbcad4d0205c91963d4a9eb2d595a3ec10fa0fdf4
+R 156c1068608d73b6c04a73abb658869e
 U drh
-Z bae80fe0062bce2a09237dc9749d4f41
+Z 48c7e5fa14a791868247c634dc1c52ad
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index dadf8fc937d003c7da7e296011da5bd0c29af9d2..121b0eb585c6648952dcca6b867dcb5ffd92ec41 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6daa7b69695e1b68dba317abbcad4d0205c91963d4a9eb2d595a3ec10fa0fdf4
\ No newline at end of file
+15ffd932fecc82a5791b2024f55d2ec80887e8eb7345de68d6f5cac4912cfbe8
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 64631365071ea2861c7be1ddeff95456bb401237..f2d94237a86843d79db46b0a2365097d932be90e 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -8290,6 +8290,7 @@ case OP_VColumn: {           /* ncycle */
   const sqlite3_module *pModule;
   Mem *pDest;
   sqlite3_context sContext;
+  FuncDef nullFunc;
 
   VdbeCursor *pCur = p->apCsr[pOp->p1];
   assert( pCur!=0 );
@@ -8307,6 +8308,8 @@ case OP_VColumn: {           /* ncycle */
   memset(&sContext, 0, sizeof(sContext));
   sContext.pOut = pDest;
   sContext.enc = encoding;
+  nullFunc.pUserData = 0;
+  sContext.pFunc = &nullFunc;
   assert( pOp->p5==OPFLAG_NOCHNG || pOp->p5==0 );
   if( pOp->p5 & OPFLAG_NOCHNG ){
     sqlite3VdbeMemSetNull(pDest);

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 6b32506f9fcbcafd1e86a36eb4c4f99a8c8f0af7..91843f56366cac87efc4603de6d1469ea7418f6d 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -845,7 +845,7 @@ int sqlite3_step(sqlite3_stmt *pStmt){
 ** pointer to it.
 */
 void *sqlite3_user_data(sqlite3_context *p){
-  return (p && p->pFunc) ? p->pFunc->pUserData : 0;
+  return p->pFunc->pUserData;
 }
 
 /*