From: drh <drh@noemail.net>
Date: Tue, 31 Mar 2015 11:42:23 +0000 (+0000)
Subject: Ensure that comparison operators do not mess up the MEM_Dyn flag on registers
X-Git-Tag: version-3.8.9~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc8a6b31b69b202cd66e6c4f51beb27cf01d9c11;p=thirdparty%2Fsqlite.git

Ensure that comparison operators do not mess up the MEM_Dyn flag on registers
when reverting affinity changes.

FossilOrigin-Name: 02e3c88fbf6abdcf3975fb0fb71972b0ab30da30
---

diff --git a/manifest b/manifest
index 830165f1d1..8a2a10e6c4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prevent\sa\spossible\sinfinite\sloop\swhen\strying\sto\sDROP\sa\stable\sfrom\na\scorrupt\sdatabase.
-D 2015-03-30T23:43:56.191
+C Ensure\sthat\scomparison\soperators\sdo\snot\smess\sup\sthe\sMEM_Dyn\sflag\son\sregisters\nwhen\sreverting\saffinity\schanges.
+D 2015-03-31T11:42:23.599
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -293,7 +293,7 @@ F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
 F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
 F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
-F src/vdbe.c bbfede5a8a6908b3ddcd55fdb0b2301288dd4754
+F src/vdbe.c 86ae6f4774410868af41bd839b72b7081ff03e78
 F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
@@ -1248,7 +1248,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ab5800291e1908b5b51d912feeacf748dc9be14b
-R 7b7ce803eb05ad2f210c6eb94fdd8e1c
+P 395bb3e677a6551b06ba96fc58c393132b93d1e8
+R 32fb3cc594bfc0fa1b6de17fb4714420
 U drh
-Z 53c46ef4969a0037acc3578044ba6e9e
+Z 6c9b38c06aabdc797714a509c4f32228
diff --git a/manifest.uuid b/manifest.uuid
index b562506b7f..b6c886cfee 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-395bb3e677a6551b06ba96fc58c393132b93d1e8
\ No newline at end of file
+02e3c88fbf6abdcf3975fb0fb71972b0ab30da30
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index ec5e6d7442..f2de90d14c 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1920,11 +1920,15 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
         testcase( pIn1->flags & MEM_Int );
         testcase( pIn1->flags & MEM_Real );
         sqlite3VdbeMemStringify(pIn1, encoding, 1);
+        testcase( (flags1&MEM_Dyn) != (pIn1->flags&MEM_Dyn) );
+        flags1 = (pIn1->flags & ~MEM_TypeMask) | (flags1 & MEM_TypeMask);
       }
       if( (pIn3->flags & MEM_Str)==0 && (pIn3->flags & (MEM_Int|MEM_Real))!=0 ){
         testcase( pIn3->flags & MEM_Int );
         testcase( pIn3->flags & MEM_Real );
         sqlite3VdbeMemStringify(pIn3, encoding, 1);
+        testcase( (flags3&MEM_Dyn) != (pIn3->flags&MEM_Dyn) );
+        flags3 = (pIn3->flags & ~MEM_TypeMask) | (flags3 & MEM_TypeMask);
       }
     }
     assert( pOp->p4type==P4_COLLSEQ || pOp->p4.pColl==0 );
@@ -1961,7 +1965,9 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
     }
   }
   /* Undo any changes made by applyAffinity() to the input registers. */
+  assert( (pIn1->flags & MEM_Dyn) == (flags1 & MEM_Dyn) );
   pIn1->flags = flags1;
+  assert( (pIn3->flags & MEM_Dyn) == (flags3 & MEM_Dyn) );
   pIn3->flags = flags3;
   break;
 }