From: dan Date: Mon, 8 Apr 2013 10:38:57 +0000 (+0000) Subject: Fix an incorrect type cast in an assignment in vdbe.c. X-Git-Tag: version-3.7.17~106 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbfe388d314f44de6891ede3eaaaa926b0c7769e;p=thirdparty%2Fsqlite.git Fix an incorrect type cast in an assignment in vdbe.c. FossilOrigin-Name: 320b5295da57023399c7b9eed82eae40cf619803 --- diff --git a/manifest b/manifest index 5497db1fb1..20d73d0f91 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Increase\sthe\sdefault\sSQLITE_MAX_SCHEMA_RETRY\sto\s50.\s\sMake\ssure\sthat\smacro\ncovers\severy\scase\swhere\sa\sprepared\sstatement\smight\sneed\sto\sbe\sreprepared\sdue\nto\sa\sschema\schange.\s\sThe\ssqlite3_exec()\sinterface\snow\suses\s\nsqlite3_prepare_v2(). -D 2013-04-06T18:06:51.485 +C Fix\san\sincorrect\stype\scast\sin\san\sassignment\sin\svdbe.c. +D 2013-04-08T10:38:57.721 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in aafa71d66bab7e87fb2f348152340645f79f0244 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -239,7 +239,7 @@ F src/update.c a2a5631d618cbe240fc83725fa9e95c56ae0084c F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9 F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3 -F src/vdbe.c 1d56617d816098a41bdbe73536a67dcdefad52bd +F src/vdbe.c 5f0047130f80c7fd0bc41bc51a653b5542c4fbd5 F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d F src/vdbeInt.h c1e830268b75f04a2901dd895b51a637a26c7045 F src/vdbeapi.c 085cf9bf169b859a6c8fa43791702bac805cb7aa @@ -1044,7 +1044,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P 07a0e4e9820a85bf1690214fef3577866c763f92 -R 2fd4d54ffecba80bddc0b0bfdd8ef6ea -U drh -Z d5343d886a406d77dc84001af2f5f17d +P c1d7304c80c4a6244c8a9f6fad1eebd0f339c724 +R 9455b151c7a6a645888f7422c4787f65 +U dan +Z 3be6f6ee1162b72435a62041d8441b1f diff --git a/manifest.uuid b/manifest.uuid index 85d44ed73b..8700cad9be 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c1d7304c80c4a6244c8a9f6fad1eebd0f339c724 \ No newline at end of file +320b5295da57023399c7b9eed82eae40cf619803 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 688621d951..f343e13d4e 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3515,7 +3515,7 @@ case OP_SeekGt: { /* jump, in3 */ ** r.flags = 0; ** } */ - r.flags = (u16)(UNPACKED_INCRKEY * (1 & (oc - OP_SeekLt))); + r.flags = (u8)(UNPACKED_INCRKEY * (1 & (oc - OP_SeekLt))); assert( oc!=OP_SeekGt || r.flags==UNPACKED_INCRKEY ); assert( oc!=OP_SeekLe || r.flags==UNPACKED_INCRKEY ); assert( oc!=OP_SeekGe || r.flags==0 );