Allow the sqlite3_user_data() function to be invoked with a NULL argument

or with an sqlite3_context pointer from a virtual table.  It returns NULL
in both cases.

FossilOrigin-Name: 2f49687371ada65fef374336c28b352c48ab98dc31282ac82397035efe04ba11

diff --git a/manifest b/manifest
index 9246cdfdde2fe04354cc0e6fdebab5e0d569e212..6ac2aacfe0819b1cb03ac3001a5f76bebd53849a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\schanges\sinto\sthe\sjsonb\sbranch\sfor\sthe\scompiler\swarning\sfixes\nfrom\stwo\sdays\sago.
-D 2023-09-28T17:41:45.378
+C Allow\sthe\ssqlite3_user_data()\sfunction\sto\sbe\sinvoked\swith\sa\sNULL\sargument\nor\swith\san\ssqlite3_context\spointer\sfrom\sa\svirtual\stable.\s\sIt\sreturns\sNULL\nin\sboth\scases.
+D 2023-09-28T18:23:52.254
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -783,7 +783,7 @@ F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 F src/vdbe.c cd112eb00d20fc5cc44f631d0e713838602637328b0f127c2f3c2aa8cea3cc91
 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
-F src/vdbeapi.c 4184402246172220418c0ef49ff4cf1a19ced9a4ac6c843c2f0773fb5c543f37
+F src/vdbeapi.c 7fdd1eec6b967a5455ccc45a43b84fd32746d6749a423104333f9ba5cec56c9f
 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 5853065b7ee326c04ddfcde64c178f487af04cd3adc3cc99f559907484ec169d b488b9fb71652eca90d2bf73d32f3d748badf517859dc833c58e021b0e017194
-R 9fc8b28e091a22aa2df6890c9cd30c84
+P cee113cc315b04fd75ccc172cf4529bf15b2050bf274433496c31a282e281ab8
+R 447caeefd53e356f21199c52281cba5f
 U drh
-Z 296260cf4c2437a82708d346d0a00f10
+Z 98132ac7eca8ce40c36975540dff67b4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8230cfa03a659defd74aa8abfb526cebbea59dc1..f38a3e887b0bba3e484e941d8136dea038dbb29f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cee113cc315b04fd75ccc172cf4529bf15b2050bf274433496c31a282e281ab8
\ No newline at end of file
+2f49687371ada65fef374336c28b352c48ab98dc31282ac82397035efe04ba11
\ No newline at end of file

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