/ Check-in [9a93c68a]
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: 9a93c68a7673bda2e6c308d3b2798d0fb12fde399996cae24b1f0d5864adf355
User & Date: drh 2019-01-29 16:54:31
Context
2019-01-30
12:15
Fix another buffer overread in fts5 that may occur when accessing a corrupt database. check-in: 760d1437 user: dan tags: trunk
2019-01-29
19:17
Merge enhancements from trunk. check-in: 31efcc37 user: drh tags: apple-osx
16:54
Fix harmless compiler warnings. check-in: 9a93c68a user: drh tags: trunk
16:47
Load all the latest dbsqlfuzz finds into test/fuzzdata8.db. check-in: e744d2dd user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3_aux.c.

   413    413   
   414    414     if( iEq>=0 || iGe>=0 ){
   415    415       const unsigned char *zStr = sqlite3_value_text(apVal[0]);
   416    416       assert( (iEq==0 && iGe==-1) || (iEq==-1 && iGe==0) );
   417    417       if( zStr ){
   418    418         pCsr->filter.zTerm = sqlite3_mprintf("%s", zStr);
   419    419         if( pCsr->filter.zTerm==0 ) return SQLITE_NOMEM;
   420         -      pCsr->filter.nTerm = strlen(pCsr->filter.zTerm);
          420  +      pCsr->filter.nTerm = (int)strlen(pCsr->filter.zTerm);
   421    421       }
   422    422     }
   423    423   
   424    424     if( iLe>=0 ){
   425    425       pCsr->zStop = sqlite3_mprintf("%s", sqlite3_value_text(apVal[iLe]));
   426    426       if( pCsr->zStop==0 ) return SQLITE_NOMEM;
   427         -    pCsr->nStop = strlen(pCsr->zStop);
          427  +    pCsr->nStop = (int)strlen(pCsr->zStop);
   428    428     }
   429    429     
   430    430     if( iLangid>=0 ){
   431    431       iLangVal = sqlite3_value_int(apVal[iLangid]);
   432    432   
   433    433       /* If the user specified a negative value for the languageid, use zero
   434    434       ** instead. This works, as the "languageid=?" constraint will also

Changes to src/btree.c.

  6820   6820     u8 *pTmp = sqlite3PagerTempSpace(pPg->pBt->pPager);
  6821   6821     u8 *pData;
  6822   6822     int k;                          /* Current slot in pCArray->apEnd[] */
  6823   6823     u8 *pSrcEnd;                    /* Current pCArray->apEnd[k] value */
  6824   6824   
  6825   6825     assert( i<iEnd );
  6826   6826     j = get2byte(&aData[hdr+5]);
  6827         -  if( NEVER(j>usableSize) ){ j = 0; }
         6827  +  if( NEVER(j>(u32)usableSize) ){ j = 0; }
  6828   6828     memcpy(&pTmp[j], &aData[j], usableSize - j);
  6829   6829   
  6830   6830     for(k=0; pCArray->ixNx[k]<=i && ALWAYS(k<NB*2); k++){}
  6831   6831     pSrcEnd = pCArray->apEnd[k];
  6832   6832   
  6833   6833     pData = pEnd;
  6834   6834     while( 1/*exit by break*/ ){