tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

indexing: an error on an archive member could crash or block the indexing because of the unclean way the ipath was passed in/out of internfile(). Closes issue #55

Browse Source
This commit is contained in:
Jean-Francois Dockes
2011-04-25 16:41:43 +02:00
parent 0039ba9ecf
commit f4c1c3678d
6 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/index/beaglequeue.cpp
+2 -4
View File
@@ -232,10 +232,9 @@ bool BeagleQueueIndexer::indexFromCache(const string& udi)
FileInterner interner(data, m_config, m_tmpdir,
FileInterner::FIF_doUseInputMimetype,
dotdoc.mimetype);
string ipath;
FileInterner::Status fis;
try {
fis = interner.internfile(doc, ipath);
fis = interner.internfile(doc);
} catch (CancelExcept) {
LOGERR(("BeagleQueueIndexer: interrupted\n"));
return false;
@@ -437,10 +436,9 @@ BeagleQueueIndexer::processone(const string &path,
FileInterner interner(path, stp, m_config, m_tmpdir,
FileInterner::FIF_doUseInputMimetype,
&dotdoc.mimetype);
string ipath;
FileInterner::Status fis;
try {
fis = interner.internfile(doc, ipath);
fis = interner.internfile(doc);
} catch (CancelExcept) {
LOGERR(("BeagleQueueIndexer: interrupted\n"));
goto out;
src/index/fsindexer.cpp
+6 -9
View File
@@ -391,9 +391,8 @@ FsIndexer::processone(const std::string &fn, const struct stat *stp,
bool hadNullIpath = false;
while (fis == FileInterner::FIAgain) {
doc.erase();
string ipath;
try {
fis = interner.internfile(doc, ipath);
fis = interner.internfile(doc);
} catch (CancelExcept) {
LOGERR(("fsIndexer::processone: interrupted\n"));
return FsTreeWalker::FtwStop;
@@ -404,10 +403,8 @@ FsIndexer::processone(const std::string &fn, const struct stat *stp,
// be retried every time.
// Internal access path for multi-document files
if (ipath.empty())
if (doc.ipath.empty())
hadNullIpath = true;
else
doc.ipath = ipath;
// Set file name, mod time and url if not done by filter
if (doc.fmtime.empty())
@@ -441,8 +438,8 @@ FsIndexer::processone(const std::string &fn, const struct stat *stp,
// Add document to database. If there is an ipath, add it as a children
// of the file document.
string udi;
make_udi(fn, ipath, udi);
if (!m_db->addOrUpdate(udi, ipath.empty() ? "" : parent_udi, doc))
make_udi(fn, doc.ipath, udi);
if (!m_db->addOrUpdate(udi, doc.ipath.empty() ? "" : parent_udi, doc))
return FsTreeWalker::FtwError;
// Tell what we are doing and check for interrupt request
@@ -451,8 +448,8 @@ FsIndexer::processone(const std::string &fn, const struct stat *stp,
if (m_updater->status.dbtotdocs < m_updater->status.docsdone)
m_updater->status.dbtotdocs = m_updater->status.docsdone;
m_updater->status.fn = fn;
if (!ipath.empty())
m_updater->status.fn += "|" + ipath;
if (!doc.ipath.empty())
m_updater->status.fn += "|" + doc.ipath;
if (!m_updater->update()) {
return FsTreeWalker::FtwStop;
}