/ Check-in [0354ab27]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix some extra instances of the constants addressed by [83e47ca006].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0354ab279f0ea9915a14d1ed972b4aa6b5a27fd1
User & Date: dan 2010-03-03 16:02:06
Context
2010-03-03
22:25
Modify the sqlite3_log() interface and implementation so that it never uses dynamic memory allocation - to avoid deadlocking when called while holding the memory allocator mutex. check-in: 28d1bc98 user: drh tags: trunk
16:54
Merged trunk to lemon-update-2010 branch. check-in: 88b466ba user: icculus tags: lemon-update-2010
16:02
Fix some extra instances of the constants addressed by [83e47ca006]. check-in: 0354ab27 user: dan tags: trunk
15:18
Factor out constant expressions in sqlite3GetVarint() to work around nuisance warning messages from the RVT compiler. check-in: 83e47ca0 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/util.c.

   927    927   
   928    928     p++;
   929    929     a = a<<14;
   930    930     a |= *p;
   931    931     /* a: p0<<28 | p2<<14 | p4 (unmasked) */
   932    932     if (!(a&0x80))
   933    933     {
   934         -    /* Walues  between 268435456 and 34359738367 */
   935         -    a &= (0x1f<<28)|(0x7f<<14)|(0x7f);
   936         -    b &= (0x1f<<28)|(0x7f<<14)|(0x7f);
          934  +    /* Values  between 268435456 and 34359738367 */
          935  +    a &= SLOT_4_2_0;
          936  +    b &= SLOT_4_2_0;
   937    937       b = b<<7;
   938    938       *v = a | b;
   939    939       return 5;
   940    940     }
   941    941   
   942    942     /* We can only reach this point when reading a corrupt database
   943    943     ** file.  In that case we are not in any hurry.  Use the (relatively