database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Fix gcc gripe about parens in a ||/&& in mergePosList().

Browse Source 
Drop unused pBlob/nBlob in index_insert_term().
Fix NULL deref in an assertion in docListUpdate() delete case.
Minor code tightening in docListUpdate(). (CVS 3367)

FossilOrigin-Name: a6fcf9101a831bf5f129c6045eabf30376d365dc
This commit is contained in:
shess
2006-08-25 19:20:26 +00:00
parent b8b1421963
commit 0de250e46f
3 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ext/fts1/fulltext.c
View File

@ -294,14 +294,13 @@ static int docListUpdate(DocList *d, sqlite_int64 iDocid, DocList *pUpdate){
DocListReader reader;
char *p;
assert( d->iType==pUpdate->iType);
if( pUpdate!=NULL ){
assert( d->iType==pUpdate->iType);
assert( iDocid==firstDocid(pUpdate) );
}
readerInit(&reader, d);
while( !readerAtEnd(&reader) ){
if( peekDocid(&reader) >= iDocid ) break;
while( !readerAtEnd(&reader) && peekDocid(&reader)<iDocid ){
skipDocument(&reader);
}
@ -316,19 +315,15 @@ static int docListUpdate(DocList *d, sqlite_int64 iDocid, DocList *pUpdate){
/* Insert if indicated. */
if( pUpdate!=NULL ){
int iDoclist;
int nNeed;
int iDoclist = p-d->pData;
docListAddEndPos(pUpdate);
nNeed = pUpdate->nData;
iDoclist = p - d->pData;
d->pData = realloc(d->pData, d->nData+nNeed);
d->pData = realloc(d->pData, d->nData+pUpdate->nData);
p = d->pData + iDoclist;
memmove(p+nNeed, p, docListEnd(d) - p);
memcpy(p, pUpdate->pData, nNeed);
p += nNeed;
d->nData += nNeed;
memmove(p+pUpdate->nData, p, docListEnd(d) - p);
memcpy(p, pUpdate->pData, pUpdate->nData);
d->nData += pUpdate->nData;
modified = 1;
}
@ -413,7 +408,7 @@ static void mergePosList(DocListMerge *m, sqlite_int64 iDocid,
}
block_pos = readPosition(pBlockReader);
in_pos = readPosition(&m->in);
} else if( in_pos==-1 || block_pos!=-1 && block_pos-m->iOffset<in_pos ){
} else if( in_pos==-1 || (block_pos!=-1 && block_pos-m->iOffset<in_pos) ){
block_pos = readPosition(pBlockReader);
} else {
in_pos = readPosition(&m->in);
@ -1338,8 +1333,6 @@ static int index_insert_term(fulltext_vtab *v, const char *zTerm, int nTerm,
sqlite_int64 iFirst;
sqlite_int64 iIndexRow;
DocList doclist;
char *pBlob = NULL;
int nBlob = 0;
int rc = term_chunk_select(v, zTerm, nTerm, iDocid, &iFirst);
if( rc==SQLITE_DONE ){