Skip to content

Fix crash on corrupt field number in FieldsReader::doc() #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Johnson-zs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix crash on corrupt field number in FieldsReader::doc() #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/core/index/FieldsReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ DocumentPtr FieldsReader::doc(int32_t n, const FieldSelectorPtr& fieldSelector)
for (int32_t i = 0; i < numFields; ++i) {
int32_t fieldNumber = fieldsStream->readVInt();
FieldInfoPtr fi = fieldInfos->fieldInfo(fieldNumber);
if (!fi) {
boost::throw_exception(CorruptIndexException(L"invalid field number " + StringUtils::toString(fieldNumber)
+ L" while reading stored fields for doc " + StringUtils::toString(n)));
}
FieldSelector::FieldSelectorResult acceptField = fieldSelector ? fieldSelector->accept(fi->name) : FieldSelector::SELECTOR_LOAD;

uint8_t bits = fieldsStream->readByte();
Expand Down
39 changes: 39 additions & 0 deletions src/test/index/FieldsReaderTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "IndexReader.h"
#include "MiscUtils.h"
#include "FileUtils.h"
#include "IndexFileNames.h"
#include "IndexOutput.h"

using namespace Lucene;

Expand Down Expand Up @@ -378,6 +380,43 @@ class TestableFieldSelector : public FieldSelector {

}

static void writeCorruptedStoredFieldsIndex(const DirectoryPtr& sourceDir,
const DirectoryPtr& corruptDir,
const String& segmentName)
{
String fieldsName = segmentName + L"." + IndexFileNames::FIELDS_EXTENSION();
IndexInputPtr in = sourceDir->openInput(fieldsName);
ByteArray data(ByteArray::newInstance((int32_t)in->length()));
in->readBytes(data.get(), 0, (int32_t)in->length());
in->close();

// Overwrite the first stored field number with an invalid VInt.
data[5] = 0x7f;
data[6] = 0x7f;

IndexOutputPtr out = corruptDir->createOutput(fieldsName);
out->writeBytes(data.get(), 0, (int32_t)data.size());
out->close();
}

TEST_F(FieldsReaderTest, testCorruptFieldNumber) {
String indexDir(FileUtils::joinPath(getTempDir(), L"testfieldreaderbadfieldnumber"));
RAMDirectoryPtr sourceDir = newLucene<RAMDirectory>();
IndexWriterPtr writer = newLucene<IndexWriter>(sourceDir, newLucene<WhitespaceAnalyzer>(), true, IndexWriter::MaxFieldLengthLIMITED);
writer->setUseCompoundFile(false);
writer->addDocument(testDoc);
writer->close();

RAMDirectoryPtr corruptDir = newLucene<RAMDirectory>(sourceDir);
writeCorruptedStoredFieldsIndex(sourceDir, corruptDir, TEST_SEGMENT_NAME);

FieldsReaderPtr reader = newLucene<FieldsReader>(corruptDir, TEST_SEGMENT_NAME, fieldInfos);
EXPECT_THROW(reader->doc(0, FieldSelectorPtr()), CorruptIndexException);
reader->close();
sourceDir->close();
corruptDir->close();
}

TEST_F(FieldsReaderTest, testLoadSize) {
FieldsReaderPtr reader = newLucene<FieldsReader>(dir, TEST_SEGMENT_NAME, fieldInfos);
DocumentPtr doc = reader->doc(0, newLucene<TestLoadSize::TestableFieldSelector>());
Expand Down