chromium/chromium-20.0.1132.43-fix_sqlite_history_Segfault_2.patch

27 lines
1.1 KiB
Diff
Raw Normal View History

--- trunk/src/third_party/sqlite/src/ext/fts3/fts3_write.c 2012/06/12 18:07:00 141686
+++ trunk/src/third_party/sqlite/src/ext/fts3/fts3_write.c 2012/06/12 18:13:09 141687
@@ -1238,13 +1238,13 @@
Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */
){
Fts3SegReader *pReader = 0; /* Fts3SegReader object to return */
+ Fts3HashElem *pE; /* Iterator variable */
Fts3HashElem **aElem = 0; /* Array of term hash entries to scan */
int nElem = 0; /* Size of array at aElem */
int rc = SQLITE_OK; /* Return Code */
if( isPrefix ){
int nAlloc = 0; /* Size of allocated array at aElem */
- Fts3HashElem *pE = 0; /* Iterator variable */
for(pE=fts3HashFirst(&p->pendingTerms); pE; pE=fts3HashNext(pE)){
char *zKey = (char *)fts3HashKey(pE);
@@ -1276,7 +1276,7 @@
}
}else{
- Fts3HashElem *pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
+ pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
if( pE ){
aElem = &pE;
nElem = 1;