36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
Index: OpenCC-ver.1.0.5/src/BinaryDict.cpp
|
||
|
|
===================================================================
|
||
|
|
--- OpenCC-ver.1.0.5.orig/src/BinaryDict.cpp
|
||
|
|
+++ OpenCC-ver.1.0.5/src/BinaryDict.cpp
|
||
|
|
@@ -63,6 +63,12 @@ void BinaryDict::SerializeToFile(FILE* f
|
||
|
|
}
|
||
|
|
|
||
|
|
BinaryDictPtr BinaryDict::NewFromFile(FILE* fp) {
|
||
|
|
+ size_t offsetBound, savedOffset;
|
||
|
|
+ savedOffset = ftell(fp);
|
||
|
|
+ fseek(fp, 0L, SEEK_END);
|
||
|
|
+ offsetBound = ftell(fp) - savedOffset;
|
||
|
|
+ fseek(fp, savedOffset, SEEK_SET);
|
||
|
|
+
|
||
|
|
BinaryDictPtr dict(new BinaryDict(LexiconPtr(new Lexicon)));
|
||
|
|
|
||
|
|
// Number of items
|
||
|
|
@@ -109,7 +115,7 @@ BinaryDictPtr BinaryDict::NewFromFile(FI
|
||
|
|
// Key offset
|
||
|
|
size_t keyOffset;
|
||
|
|
unitsRead = fread(&keyOffset, sizeof(size_t), 1, fp);
|
||
|
|
- if (unitsRead != 1) {
|
||
|
|
+ if (unitsRead != 1 || keyOffset >= offsetBound) {
|
||
|
|
throw InvalidFormat("Invalid OpenCC binary dictionary (keyOffset)");
|
||
|
|
}
|
||
|
|
const char* key = dict->keyBuffer.c_str() + keyOffset;
|
||
|
|
@@ -118,7 +124,7 @@ BinaryDictPtr BinaryDict::NewFromFile(FI
|
||
|
|
for (size_t j = 0; j < numValues; j++) {
|
||
|
|
size_t valueOffset;
|
||
|
|
unitsRead = fread(&valueOffset, sizeof(size_t), 1, fp);
|
||
|
|
- if (unitsRead != 1) {
|
||
|
|
+ if (unitsRead != 1 || valueOffset >= offsetBound) {
|
||
|
|
throw InvalidFormat("Invalid OpenCC binary dictionary (valueOffset)");
|
||
|
|
}
|
||
|
|
const char* value = dict->valueBuffer.c_str() + valueOffset;
|