database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Fix an assert() that might fail if sqlite3_create_function_v2() is invoked with NULL xStep and xFinal callbacks and a non-NULL xDestroy.

Browse Source 
FossilOrigin-Name: ab1550a608684b6b9104b555a975482cfabca5053b7d7dcc60d63a0e3a8d707d
This commit is contained in:
dan
2021-07-09 14:59:12 +00:00
parent 62f560f805
commit 8eed584786
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Enhance\sthe\ssqlite3_create_function()\sinterfaces\sto\sassume\sa\svalue\sof\nSQLITE_UTF8\sis\spresented\swith\sa\snonsense\svalue\sfor\sthe\spreferred\sencoding.\nThis\sis\sundocumented\sbehavior\sadded\sfor\srobustness. C Fix\san\sassert()\sthat\smight\sfail\sif\ssqlite3_create_function_v2()\sis\sinvoked\swith\sNULL\sxStep\sand\sxFinal\scallbacks\sand\sa\snon-NULL\sxDestroy.
D 2021-07-09T13:52:01.084 D 2021-07-09T14:59:12.343
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -508,7 +508,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
F src/insert.c d560dc585c50e01b015cbf924c173de88f61c8c85b3d1adb9d4865b92fff2d72 F src/insert.c d560dc585c50e01b015cbf924c173de88f61c8c85b3d1adb9d4865b92fff2d72
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
F src/loadext.c 0aa9e7f08e168e3874cb54984408e3976dafdf5616d511952c425b5ac088ea3e F src/loadext.c 0aa9e7f08e168e3874cb54984408e3976dafdf5616d511952c425b5ac088ea3e
F src/main.c 6df43445e0c0c45642aff43726c0b2d42fcbb73c0c5a1e805c3b5b3c9b4eb106 F src/main.c 5d024b9b96d9c6809e66b7f4864c3745bc8caf2a6af3b27dc0f05328f4439dfd
F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1037,7 +1037,7 @@ F test/fts4upfrom.test f25835162c989dffd5e2ef91ec24c4848cc9973093e2d492d1c7b32af
F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
F test/func.test 77f6ea02c97d9ea64074461d347276a75df22d2cf51045a40f90857569e985f0 F test/func.test 77f6ea02c97d9ea64074461d347276a75df22d2cf51045a40f90857569e985f0
F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
F test/func3.test 2bb0f31ab7baaed690b962a88544d7be6b34fa389364bc36a44e441ed3e3f1e6 F test/func3.test 600a632c305a88f3946d38f9a51efe145c989b2e13bd2b2a488db47fe76bab6a
F test/func4.test 2285fb5792d593fef442358763f0fd9de806eda47dbc7a5934df57ffdc484c31 F test/func4.test 2285fb5792d593fef442358763f0fd9de806eda47dbc7a5934df57ffdc484c31
F test/func5.test 863e6d1bd0013d09c17236f8a13ea34008dd857d87d85a13a673960e4c25d82a F test/func5.test 863e6d1bd0013d09c17236f8a13ea34008dd857d87d85a13a673960e4c25d82a
F test/func6.test 90e42b64c4f9fb6f04f44cb8a1da586c8542502e926b19c76504fe74ff2a9b7c F test/func6.test 90e42b64c4f9fb6f04f44cb8a1da586c8542502e926b19c76504fe74ff2a9b7c
@@ -1920,7 +1920,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 0f97c2a459bfadc2fe19e710e8845039b4434010656d311074b9594b02d0826a P c1bb5cff527af6a97b025d646581c68ac9b56924ae199f86964026a7bc9724fd
R 7868302cf3bc690aec9205f019a549f7 R 2f585f1a71d6f5a7312cf10f6b97e250
U drh U dan
Z f8eef76cb448b8627630bf5bdf905136 Z 417b62b479932df1736f5199ded86ec1

2
manifest.uuid
View File

@@ -1 +1 @@
c1bb5cff527af6a97b025d646581c68ac9b56924ae199f86964026a7bc9724fd ab1550a608684b6b9104b555a975482cfabca5053b7d7dcc60d63a0e3a8d707d

2
src/main.c
View File

@@ -1977,7 +1977,7 @@ static int createFunctionApi(
xSFunc, xStep, xFinal, xValue, xInverse, pArg xSFunc, xStep, xFinal, xValue, xInverse, pArg
); );
if( pArg && pArg->nRef==0 ){ if( pArg && pArg->nRef==0 ){
assert( rc!=SQLITE_OK ); assert( rc!=SQLITE_OK || (xStep==0 && xFinal==0) );
xDestroy(p); xDestroy(p);
sqlite3_free(pArg); sqlite3_free(pArg);
} }

8
test/func3.test
View File

@@ -198,6 +198,14 @@ do_test func3-5.59 {
} [db eval {EXPLAIN SELECT min(1.0+'2.0',4*11)}] } [db eval {EXPLAIN SELECT min(1.0+'2.0',4*11)}]
# Test the outcome of specifying NULL xStep and xFinal pointers (normally
# used to delete any existing function) and a non-NULL xDestroy when there
# is no existing function to destroy.
#
do_test func3-6.0 {
sqlite3_create_function_v2 db nofunc 1 utf8
} {}
finish_test finish_test