/ Check-in [78c2e62b]
Login

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

Overview
Comment:Fix harmless compiler warning seen with MSVC.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 78c2e62bb4c529595aaaf2e1f5f26387ad977b1b
User & Date: mistachkin 2015-01-21 00:51:08
Context
2015-01-21
17:00
Fix an assert() that may fail following an OOM error. check-in: 5f592359 user: dan tags: trunk
00:51
Fix harmless compiler warning seen with MSVC. check-in: 78c2e62b user: mistachkin tags: trunk
00:48
Enhancements to entropy generation for the Win32 VFS. check-in: 26190b3c user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbeaux.c.

  3369   3369     u32 szHdr;
  3370   3370     u32 idx;
  3371   3371     u32 notUsed;
  3372   3372     const unsigned char *aKey = (const unsigned char*)pKey;
  3373   3373   
  3374   3374     if( CORRUPT_DB ) return;
  3375   3375     idx = getVarint32(aKey, szHdr);
  3376         -  assert( szHdr<=nKey );
         3376  +  assert( nKey>=0 );
         3377  +  assert( szHdr<=(u32)nKey );
  3377   3378     while( idx<szHdr ){
  3378   3379       idx += getVarint32(aKey+idx, notUsed);
  3379   3380       nField++;
  3380   3381     }
  3381   3382     assert( nField <= pKeyInfo->nField+pKeyInfo->nXField );
  3382   3383   }
  3383   3384   #else