smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #121 from kiwix/check_internal_search 

Check `internal->_search` before using it.
This commit is contained in:
Matthieu Gautier 2018-03-12 18:53:56 +01:00 committed by GitHub
parent 14653c6958 ee6831d665
commit e23949a9fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/searcher.cpp
View File

@ -247,7 +247,7 @@ void Searcher::restart_search()
{ {
if (internal->_xapianSearcher) { if (internal->_xapianSearcher) {
internal->_xapianSearcher->restart_search(); internal->_xapianSearcher->restart_search();
} else { } else if (internal->_search) {
internal->current_iterator = internal->_search->begin(); internal->current_iterator = internal->_search->begin();
} }
} }
@ -256,7 +256,8 @@ Result* Searcher::getNextResult()
{ {
if (internal->_xapianSearcher) { if (internal->_xapianSearcher) {
return internal->_xapianSearcher->getNextResult(); return internal->_xapianSearcher->getNextResult();
} else if (internal->current_iterator != internal->_search->end()) { } else if (internal->_search &&
internal->current_iterator != internal->_search->end()) {
Result* result = new _Result(this, internal->current_iterator); Result* result = new _Result(this, internal->current_iterator);
internal->current_iterator++; internal->current_iterator++;
return result; return result;