From: drh <drh@noemail.net>
Date: Sun, 22 Dec 2019 20:29:25 +0000 (+0000)
Subject: Make a hard copy of strings in constraint checks prior to applying
X-Git-Tag: version-3.31.0~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d762b2d1d5abc0fe8f438ee7e588bb29f830ab8;p=thirdparty%2Fsqlite.git

Make a hard copy of strings in constraint checks prior to applying
OP_RealAffinity, to avoid problems with a pointer accounting assert.
This change is not strictly necessary - the correct answer is obtained
without it and no UB occurs - however the pointer accounting asserts are
useful to prevent other problems so it is a simple matter to bring this
piece into compliance.  Ticket [5ad2aa6921faa1ee]

FossilOrigin-Name: 89a9dad6330270a4c3b962f86a208088d2ea9883c7d291351a77f058e0ed8b0c
---

diff --git a/manifest b/manifest
index 7a4a7f2e9e..9a6b33a79f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sconstructing\sthe\svirtual\sMATCH\sterm\sof\sthe\sWHERE\sclause\sfor\sa\svirtual\ntable\sthat\sis\sin\sa\sLEFT\sJOIN,\sbe\ssure\sto\sset\sthe\scorrect\sExpr.iRightJoinTable\nvalue.\s\sThis\svalue\sdoes\snot\sappear\sto\sever\sbe\sused,\sexcept\sinside\sof\sa\ssingle\nassert().\s\sBut\sit\sis\sgood\sto\sset\sit\scorrectly,\snevertheless.\s\sThis\sfixes\nticket\s[7929c1efb2d67e98],\swhich\sas\sfar\sas\sI\scan\stell\sis\scompletely\sharmless.
-D 2019-12-22T20:03:29.348
+C Make\sa\shard\scopy\sof\sstrings\sin\sconstraint\schecks\sprior\sto\sapplying\nOP_RealAffinity,\sto\savoid\sproblems\swith\sa\spointer\saccounting\sassert.\nThis\schange\sis\snot\sstrictly\snecessary\s-\sthe\scorrect\sanswer\sis\sobtained\nwithout\sit\sand\sno\sUB\soccurs\s-\showever\sthe\spointer\saccounting\sasserts\sare\nuseful\sto\sprevent\sother\sproblems\sso\sit\sis\sa\ssimple\smatter\sto\sbring\sthis\npiece\sinto\scompliance.\s\sTicket\s[5ad2aa6921faa1ee]
+D 2019-12-22T20:29:25.187
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -479,7 +479,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c 6c407e549406c10fde9ac3987f6d734459205239ad370369bc5fcd683084a4fa
 F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
-F src/expr.c b7f3be57e7e6d2d93152cf9313e34f44fa74d3e1f16551c32dabb6be33365f41
+F src/expr.c 59c52601a6276a1da8d871f878f9423128e35954a13e1aa4157255f32a31a6f9
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -1604,7 +1604,7 @@ F test/unique.test 93f8b2ef5ea51b9495f8d6493429b1fd0f465264
 F test/unique2.test 3674e9f2a3f1fbbfd4772ac74b7a97090d0f77d2
 F test/unixexcl.test d936ba2b06794018e136418addd59a2354eeae97
 F test/unordered.test ffeea7747d5ba962a8009a20b7e53d68cbae05b063604c68702c5998eb50c981
-F test/update.test 6a1193fbcb4546b4467d24635b1504b8e746b41d3b66dc6ace07581a62ce58fb
+F test/update.test 127fc037887808a9ff2d6a7dd9e524c215c939d15f8878dd3ee0169ad50f7b19
 F test/update2.test 67455bc61fcbcf96923c45b3bc4f87bc72be7d67575ad35f134906148c7b06d3
 F test/upsert1.test 0b740c8488fd2f5a06ac317c9913f7ef1eda8282f2db58b544b89480c51efab3
 F test/upsert2.test 9c3cdbb1a890227f6504ce4b0e3de68f4cdfa16bb21d8641208a9239896c5a09
@@ -1852,7 +1852,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 7fc733328c5914c747e048c830522ec13e433c0a86388bae47b198a3e220c6c2
-R 35709e798d183e48c9968b7861e639d6
+P ef604882a275d3d5ebd4d5a08e3fe43e148f169b7d5c3a81464fbe7f54f3582a
+R 0f642e7ac4e801ecd80846fa4200e152
 U drh
-Z 77efee16c8a9a17028736710581eb2ca
+Z 76d5702a8b98bb19970567fedd1c9377
diff --git a/manifest.uuid b/manifest.uuid
index fc715d0d55..35d9750785 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef604882a275d3d5ebd4d5a08e3fe43e148f169b7d5c3a81464fbe7f54f3582a
\ No newline at end of file
+89a9dad6330270a4c3b962f86a208088d2ea9883c7d291351a77f058e0ed8b0c
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 9603ff45e8..1536c5073e 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -3674,7 +3674,7 @@ expr_code_doover:
           }else
 #endif /* SQLITE_OMIT_GENERATED_COLUMNS */
           if( pCol->affinity==SQLITE_AFF_REAL ){
-            sqlite3VdbeAddOp2(v, OP_SCopy, iSrc, target);
+            sqlite3VdbeAddOp2(v, OP_Copy, iSrc, target);
             sqlite3VdbeAddOp1(v, OP_RealAffinity, target);
             return target;
           }else{
diff --git a/test/update.test b/test/update.test
index 76aba65cda..8b96b6658b 100644
--- a/test/update.test
+++ b/test/update.test
@@ -656,6 +656,20 @@ do_execsql_test update-17.10 {
   SELECT * FROM t1;
 } {2 3}
 
-
+# 2019-12-22 ticket 5ad2aa6921faa1ee
+# Make a hard-copy of values that need to be run through OP_RealAffinity
+# rather than a soft-copy.  This is not strictly necessary, but it avoids
+# a memory-accounting assert().
+#
+reset_db
+do_execsql_test update-18.10 {
+  PRAGMA encoding = 'UTF16';
+  CREATE TABLE t0(c0 REAL, c1);
+  INSERT INTO t0(c0,c1) VALUES('xyz',11),('uvw',22);
+  CREATE INDEX i0 ON t0(c1) WHERE c0 GLOB 3;
+  CREATE INDEX i1 ON t0(c0,c1) WHERE typeof(c0)='text' AND typeof(c1)='integer';
+  UPDATE t0 SET c1=345;
+  SELECT * FROM t0;
+} {xyz 345 uvw 345}
 
 finish_test