yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

fixed possible seg.fault

Browse source
This commit is contained in:
Nikolay Pultsin 2015-09-02 03:09:52 +01:00
parent 7793ba028a
commit bc3e7c932c
2 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

74
jni/NativeFormats/fbreader/src/formats/doc/OleMainStream.cpp
View file

@ -858,55 +858,57 @@ void OleMainStream::getStyleInfo(unsigned int papxOffset, const char *grpprlBuff
} }
void OleMainStream::getCharInfo(unsigned int chpxOffset, unsigned int /*styleId*/, const char *grpprlBuffer, unsigned int bytes, CharInfo &charInfo) { void OleMainStream::getCharInfo(unsigned int chpxOffset, unsigned int /*styleId*/, const char *grpprlBuffer, unsigned int bytes, CharInfo &charInfo) {
unsigned int sprm = 0; //single propery modifier
unsigned int offset = 0; unsigned int offset = 0;
while (bytes >= offset + 2) { while (bytes >= offset + 2) {
switch (OleUtil::getU2Bytes(grpprlBuffer, chpxOffset + offset)) { switch (OleUtil::getU2Bytes(grpprlBuffer, chpxOffset + offset)) {
case 0x0835: //bold case 0x0835: //bold
sprm = OleUtil::getU1Byte(grpprlBuffer, chpxOffset + offset + 2); if (bytes >= offset + 3) {
switch (sprm) { switch (OleUtil::getU1Byte(grpprlBuffer, chpxOffset + offset + 2)) {
case UNSET: case UNSET:
charInfo.FontStyle &= ~CharInfo::FONT_BOLD; charInfo.FontStyle &= ~CharInfo::FONT_BOLD;
break; break;
case SET: case SET:
charInfo.FontStyle |= CharInfo::FONT_BOLD; charInfo.FontStyle |= CharInfo::FONT_BOLD;
break; break;
case UNCHANGED: case UNCHANGED:
break; break;
case NEGATION: case NEGATION:
charInfo.FontStyle ^= CharInfo::FONT_BOLD; charInfo.FontStyle ^= CharInfo::FONT_BOLD;
break; break;
default: default:
break; break;
}
} }
break; break;
case 0x0836: //italic case 0x0836: //italic
sprm = OleUtil::getU1Byte(grpprlBuffer, chpxOffset + offset + 2); if (bytes >= offset + 3) {
switch (sprm) { switch (OleUtil::getU1Byte(grpprlBuffer, chpxOffset + offset + 2)) {
case UNSET: case UNSET:
charInfo.FontStyle &= ~CharInfo::FONT_ITALIC; charInfo.FontStyle &= ~CharInfo::FONT_ITALIC;
break; break;
case SET: case SET:
charInfo.FontStyle |= CharInfo::FONT_ITALIC; charInfo.FontStyle |= CharInfo::FONT_ITALIC;
break; break;
case UNCHANGED: case UNCHANGED:
break; break;
case NEGATION: case NEGATION:
charInfo.FontStyle ^= CharInfo::FONT_ITALIC; charInfo.FontStyle ^= CharInfo::FONT_ITALIC;
break; break;
default: default:
break; break;
} }
}
break; break;
case 0x4a43: //size of font case 0x4a43: //size of font
charInfo.FontSize = OleUtil::getU2Bytes(grpprlBuffer, chpxOffset + offset + 2); if (bytes >= offset + 4) {
break; charInfo.FontSize = OleUtil::getU2Bytes(grpprlBuffer, chpxOffset + offset + 2);
}
break;
default: default:
break; break;
} }
offset += getPrlLength(grpprlBuffer, chpxOffset + offset); offset += getPrlLength(grpprlBuffer, chpxOffset + offset);
} }
} }
void OleMainStream::getSectionInfo(const char *grpprlBuffer, std::size_t bytes, SectionInfo &sectionInfo) { void OleMainStream::getSectionInfo(const char *grpprlBuffer, std::size_t bytes, SectionInfo &sectionInfo) {
@ -1058,7 +1060,7 @@ unsigned int OleMainStream::calcCountOfPLC(unsigned int totalSize, unsigned int
unsigned int OleMainStream::getPrlLength(const char *grpprlBuffer, unsigned int byteNumber) { unsigned int OleMainStream::getPrlLength(const char *grpprlBuffer, unsigned int byteNumber) {
unsigned int tmp; unsigned int tmp;
unsigned int opCode = OleUtil::getU2Bytes(grpprlBuffer, byteNumber); unsigned int opCode = OleUtil::getU2Bytes(grpprlBuffer, byteNumber);
switch (opCode & 0xe000) { switch (opCode & 0xE000) {
case 0x0000: case 0x0000:
case 0x2000: case 0x2000:
return 3; return 3;
@ -1073,7 +1075,7 @@ unsigned int OleMainStream::getPrlLength(const char *grpprlBuffer, unsigned int
case 0xC000: case 0xC000:
//counting of info length //counting of info length
tmp = OleUtil::getU1Byte(grpprlBuffer, byteNumber + 2); tmp = OleUtil::getU1Byte(grpprlBuffer, byteNumber + 2);
if (opCode == 0xc615 && tmp == 255) { if (opCode == 0xC615 && tmp == 255) {
unsigned int del = OleUtil::getU1Byte(grpprlBuffer, byteNumber + 3); unsigned int del = OleUtil::getU1Byte(grpprlBuffer, byteNumber + 3);
unsigned int add = OleUtil::getU1Byte(grpprlBuffer, byteNumber + 4 + del * 4); unsigned int add = OleUtil::getU1Byte(grpprlBuffer, byteNumber + 4 + del * 4);
tmp = 2 + del * 4 + add * 3; tmp = 2 + del * 4 + add * 3;

14
jni/NativeFormats/fbreader/src/formats/doc/OleUtil.cpp
View file

@ -23,25 +23,25 @@ int OleUtil::get4Bytes(const char *buffer, unsigned int offset) {
const unsigned char *buf = (const unsigned char*)buffer; const unsigned char *buf = (const unsigned char*)buffer;
return return
(int)buf[offset] (int)buf[offset]
| ((int)buf[offset+1] << 8) | ((int)buf[offset + 1] << 8)
| ((int)buf[offset+2] << 16) | ((int)buf[offset + 2] << 16)
| ((int)buf[offset+3] << 24); | ((int)buf[offset + 3] << 24);
} }
unsigned int OleUtil::getU4Bytes(const char *buffer, unsigned int offset) { unsigned int OleUtil::getU4Bytes(const char *buffer, unsigned int offset) {
const unsigned char *buf = (const unsigned char*)buffer; const unsigned char *buf = (const unsigned char*)buffer;
return return
(unsigned int)buf[offset] (unsigned int)buf[offset]
| ((unsigned int)buf[offset+1] << 8) | ((unsigned int)buf[offset + 1] << 8)
| ((unsigned int)buf[offset+2] << 16) | ((unsigned int)buf[offset + 2] << 16)
| ((unsigned int)buf[offset+3] << 24); | ((unsigned int)buf[offset + 3] << 24);
} }
unsigned int OleUtil::getU2Bytes(const char *buffer, unsigned int offset) { unsigned int OleUtil::getU2Bytes(const char *buffer, unsigned int offset) {
const unsigned char *buf = (const unsigned char*)buffer; const unsigned char *buf = (const unsigned char*)buffer;
return return
(unsigned int)buf[offset] (unsigned int)buf[offset]
| ((unsigned int)buf[offset+1] << 8); | ((unsigned int)buf[offset + 1] << 8);
} }
unsigned int OleUtil::getU1Byte(const char *buffer, unsigned int offset) { unsigned int OleUtil::getU1Byte(const char *buffer, unsigned int offset) {