Fix a problem with the CARRAY extension when the SQLITE_TRANSIENT destructor

is used for non-text arrays.
[forum:/forumpost/48e525b266|Forum thread 48e525b266].

FossilOrigin-Name: cac910c15f409c5358843643b2f90252eb90328b9e5ff84cedbccb604d9891af

diff --git a/ext/misc/carray.c b/ext/misc/carray.c
index 43d714689c489c9e40fe5b804c7c092d7d558f9b..b6eb0453a034ecd1e99431882dd9c2443f553fdb 100644 (file)
--- a/ext/misc/carray.c
+++ b/ext/misc/carray.c
@@ -464,7 +464,7 @@ SQLITE_API int sqlite3_carray_bind(
         z += n+1;
       }
     }else{
-      memcpy(pNew->aData, aData, sz*nData);
+      memcpy(pNew->aData, aData, sz);
     }
     pNew->xDel = sqlite3_free;
   }else{

diff --git a/manifest b/manifest
index 34b6328aad495db3825a2e5c610b0c6722817b1c..13b53f4dad2ba175f727a0beebcc0b0edfa49286 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\svalid\sbytecode\sis\sgenerated\sfor\sRETURNING\sclauses\seven\sif\nthe\sschema\sis\scorrupt\sand\sPRAGMA\swritable_schema\sis\sset\sso\sthat\sthe\nschema\sparse\sreturns\sno\serrors.\ndbsqlfuzz\scb21825bdcd6fdb4b686ce4f6e2f45e781d2f220
-D 2021-10-20T12:52:12.857
+C Fix\sa\sproblem\swith\sthe\sCARRAY\sextension\swhen\sthe\sSQLITE_TRANSIENT\sdestructor\nis\sused\sfor\snon-text\sarrays.\n[forum:/forumpost/48e525b266|Forum\sthread\s48e525b266].
+D 2021-10-20T13:48:12.145
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -290,7 +290,7 @@ F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a2
 F ext/misc/appendvfs.c 9642c7a194a2a25dca7ad3e36af24a0a46d7702168c4ad7e59c9f9b0e16a3824
 F ext/misc/blobio.c a867c4c4617f6ec223a307ebfe0eabb45e0992f74dd47722b96f3e631c0edb2a
 F ext/misc/btreeinfo.c d28ce349b40054eaa9473e835837bad7a71deec33ba13e39f963d50933bfa0f9
-F ext/misc/carray.c af9c4b3de67f87eb00644c3bb874b77e5917422b8d2c3ffc2853a118668501fa
+F ext/misc/carray.c b752f46411e4e47e34dce6f0c88bc8e51bb821ba9e49bfcd882506451c928f69
 F ext/misc/carray.h d2b1b12486d531367c37832d3d0dad34eea4bdd83ed839d445521ef01f0bc4e3
 F ext/misc/cksumvfs.c b42ef52eaaa510d54ec320c87bea149e934a3b06cd232be2093562bf669bd572
 F ext/misc/closure.c dbfd8543b2a017ae6b1a5843986b22ddf99ff126ec9634a2f4047cd14c85c243
@@ -758,7 +758,7 @@ F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
 F test/capi3c.test 54e2dc0c8fd7c34ad1590d1be6864397da2438c95a9f5aee2f8fbc60c112e44b
 F test/capi3d.test aba917805573a03deed961a21f07a5a84505ad0a616f7e3fc1508844a15bccc4
 F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
-F test/carray01.test 3f2658bbddd75a013735a296ae2178ff441aca3f00ba623cfbae00b732ede792
+F test/carray01.test d55d57bf66b1af1c7ac55fae66ff4910884a8f5d21a90a18797ce386212a2634
 F test/cast.test 336fa21989b5170ebcaf90c24266be22dd97b3e23d1fad5ecf6ad4efb04c4423
 F test/cffault.test 9d6b20606afe712374952eec4f8fd74b1a8097ef
 F test/changes.test 9dd8e597d84072122fc8a4fcdea837f4a54a461e6e536053ea984303e8ca937b
@@ -1929,7 +1929,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7b7d31a6153b1505288eb3e849d0d9ef9e88e961c7b2f918ef5582fd77990f6d
-R 7e4e37a135766c582a919f858b2a6a3d
+P 699117156e0b5a7beda606de56bd511af322e3efa4eee6e60f0a8d60561def64
+R cf56933f6006b45d93d99fc6072efe54
 U drh
-Z 17be0212b59eb5785076e1b476487655
+Z 590b76cfe5702e43cf5589b10e3b6679

diff --git a/manifest.uuid b/manifest.uuid
index 72d567d4e96a7bca2fff86156fed2805c9d5a5f5..3e610303b22e107a734125140c010405113310eb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-699117156e0b5a7beda606de56bd511af322e3efa4eee6e60f0a8d60561def64
\ No newline at end of file
+cac910c15f409c5358843643b2f90252eb90328b9e5ff84cedbccb604d9891af
\ No newline at end of file

diff --git a/test/carray01.test b/test/carray01.test
index 6db4f5eabc5704bfaff72a61183ffcca2c1b872f..d6243eb2743bb0d7cf3c1b6934edee3381f6e2bf 100644 (file)
--- a/test/carray01.test
+++ b/test/carray01.test
@@ -62,10 +62,34 @@ do_test 120 {
   sqlite3_carray_bind -int64 $STMT 3 1 2 3 4 5 6 7
   run_stmt $STMT 0
 } {1}
+do_test 121 {
+  sqlite3_carray_bind -int64 -transient $STMT 3 1 2 3 4 5 6 7
+  run_stmt $STMT 0
+} {1}
+do_test 122 {
+  sqlite3_carray_bind -int64 -static $STMT 3 1 2 3 4 5 6 7
+  run_stmt $STMT 0
+} {1}
+do_test 123 {
+  sqlite3_carray_bind -int32 -transient $STMT 3 1 2 3 4 5 6 7
+  run_stmt $STMT 0
+} {1}
+do_test 124 {
+  sqlite3_carray_bind -int32 -static $STMT 3 1 2 3 4 5 6 7
+  run_stmt $STMT 0
+} {1}
+do_test 125 {
+  sqlite3_carray_bind -int32 $STMT 3 1 2 3 4 5 6 7
+  run_stmt $STMT 0
+} {1}
 do_test 130 {
   sqlite3_carray_bind -int64 $STMT 3 1 2 3 4 6 7
   run_stmt $STMT 0
 } {0}
+do_test 131 {
+  sqlite3_carray_bind -int64 -transient $STMT 3 1 2 3 4 6 7
+  run_stmt $STMT 0
+} {0}
 do_test 131 {
   sqlite3_carray_bind -int64 -static $STMT 3 1 2 3 4 6 7
   run_stmt $STMT 0
@@ -74,6 +98,14 @@ do_test 140 {
   sqlite3_carray_bind -double $STMT 3 1 2 3 4 5 6 7
   run_stmt $STMT 0
 } {1}
+do_test 141 {
+  sqlite3_carray_bind -double -transient $STMT 3 1 2 3 4 5 6 7
+  run_stmt $STMT 0
+} {1}
+do_test 142 {
+  sqlite3_carray_bind -double -static $STMT 3 1 2 3 4 5 6 7
+  run_stmt $STMT 0
+} {1}
 do_test 150 {
   sqlite3_carray_bind -double $STMT 3 1 2 3 4 6 7
   run_stmt $STMT 0