/ Check-in [3ff220ad]
Login

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

Overview
Comment:Fix harmless compiler warnings.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 3ff220ad378d547538b4501e6b2201e835a2c66891e5e40856db377c101a50e5
User & Date: drh 2019-01-25 18:17:37
Context
2019-01-25
19:29
Reinitialize debugging information on registers of a trigger prior to each invocation of the trigger. This prevents false-positives from the sqlite3VdbeMemAboutToChange() test logic. check-in: 98b3b975 user: drh tags: trunk
18:17
Fix harmless compiler warnings. check-in: 3ff220ad user: drh tags: trunk
18:17
Fix the assert_fts3_nc() macro so that it works for test builds that omit SQLITE_DEBUG. check-in: b10df2b5 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbeaux.c.

  3801   3801     Mem *pMem = p->aMem;
  3802   3802   
  3803   3803     p->default_rc = 0;
  3804   3804     assert( EIGHT_BYTE_ALIGNMENT(pMem) );
  3805   3805     idx = getVarint32(aKey, szHdr);
  3806   3806     d = szHdr;
  3807   3807     u = 0;
  3808         -  while( idx<szHdr && d<=nKey ){
         3808  +  while( idx<szHdr && d<=(u32)nKey ){
  3809   3809       u32 serial_type;
  3810   3810   
  3811   3811       idx += getVarint32(&aKey[idx], serial_type);
  3812   3812       pMem->enc = pKeyInfo->enc;
  3813   3813       pMem->db = pKeyInfo->db;
  3814   3814       /* pMem->flags = 0; // sqlite3VdbeSerialGet() will set this for us */
  3815   3815       pMem->szMalloc = 0;
  3816   3816       pMem->z = 0;
  3817   3817       d += sqlite3VdbeSerialGet(&aKey[d], serial_type, pMem);
  3818   3818       pMem++;
  3819   3819       if( (++u)>=p->nField ) break;
  3820   3820     }
  3821         -  if( d>nKey && u ){
         3821  +  if( d>(u32)nKey && u ){
  3822   3822       assert( CORRUPT_DB );
  3823   3823       /* In a corrupt record entry, the last pMem might have been set up using 
  3824   3824       ** uninitialized memory. Overwrite its value with NULL, to prevent
  3825   3825       ** warnings from MSAN. */
  3826   3826       sqlite3VdbeMemSetNull(pMem-1);
  3827   3827     }
  3828   3828     assert( u<=pKeyInfo->nKeyField + 1 );