From: drh <drh@noemail.net>
Date: Fri, 5 Jun 2009 16:46:53 +0000 (+0000)
Subject: Do not cast an unsigned int into an int for comparison. (CVS 6720)
X-Git-Tag: version-3.6.15~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfb19dc698248522082a9006727b41a8f6a3dd56;p=thirdparty%2Fsqlite.git

Do not cast an unsigned int into an int for comparison. (CVS 6720)

FossilOrigin-Name: 302ab855e62dfae8507800302dae479e0494b81a
---

diff --git a/manifest b/manifest
index ebe66662fe..0b449ad213 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Take\scare\sthat\sa\scorrupt\svariable-length\sinteger\sdoes\snot\scause\s32-bit\ninteger\soverflow\swhen\sparsing\sa\srecord\sformat,\snor\scause\sexcessively\slarge\nmemory\sallocations.\s(CVS\s6719)
-D 2009-06-05T14:17:22
+C Do\snot\scast\san\sunsigned\sint\sinto\san\sint\sfor\scomparison.\s(CVS\s6720)
+D 2009-06-05T16:46:53
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -203,7 +203,7 @@ F src/update.c 6ae6c26adff8dc34532d578f66e6cfde04b5d177
 F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
 F src/util.c 8ff385a6b474e840d4fa3621f5f7263028ac892c
 F src/vacuum.c 0e14f371ea3326c6b8cfba257286d798cd20db59
-F src/vdbe.c 7f8639cf36a0bb87a4e31bc31432f8af10c3b252
+F src/vdbe.c 434e3803de90697cfa6cc53f0f6719a575cde107
 F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
 F src/vdbeInt.h 3727128255a93d116e454f67d4559700f7ae4d6f
 F src/vdbeapi.c 86aa27a5f3493aaffb8ac051782aa3b22670d7ed
@@ -733,7 +733,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P e557c8e5846f9c4eaaeb3bd07614ac101bb0b3d0
-R aadc9c06bb2a87f3514e9a9c55bcfa54
+P 38b20327a80996c7044b88be32161ac4ac0ec3a9
+R a65e9b0759a650b18b638e91daa39817
 U drh
-Z 216b11c06f5be02fd997159248e30587
+Z 2ca155c507beb1a4109ae7a213f01a98
diff --git a/manifest.uuid b/manifest.uuid
index 7ad184ffeb..36871a0837 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38b20327a80996c7044b88be32161ac4ac0ec3a9
\ No newline at end of file
+302ab855e62dfae8507800302dae479e0494b81a
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 2d1e5978da..1e4c80d372 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.847 2009/06/05 14:17:24 drh Exp $
+** $Id: vdbe.c,v 1.848 2009/06/05 16:46:53 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -3959,10 +3959,10 @@ case OP_RowData: {
     if( n64>db->aLimit[SQLITE_LIMIT_LENGTH] ){
       goto too_big;
     }
-    n = (int)n64;
+    n = (u32)n64;
   }else{
     sqlite3BtreeDataSize(pCrsr, &n);
-    if( (int)n>db->aLimit[SQLITE_LIMIT_LENGTH] ){
+    if( n>db->aLimit[SQLITE_LIMIT_LENGTH] ){
       goto too_big;
     }
   }