Apple-2-Tools/ciderpress
1
0
Fork 0
mirror of https://github.com/fadden/ciderpress.git synced 2024-05-28 11:41:32 +00:00
Code Issues Projects Releases Wiki Activity

Protect against some really badly corrupted AppleWorks files. This fix keeps us from spinning on 100% CPU when the buffer "length" (corrupt, negative) will never decrease.

Browse Source
This commit is contained in:
David Schmidt 2011-09-04 20:21:40 +00:00
parent 0d0bfde65a
commit 04e7620965
1 changed files with 1118 additions and 1107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reformat/AppleWorks.cpp
View File

@ -107,7 +107,15 @@ ReformatAWP::Process(const ReformatHolder* pHolder,
* Read the line records.
*/
while (1) {
if (length < 0) {
WMSG0(" AWP truncated file\n");
goto bail;
}
lineRecData = Read8(&srcPtr, &length);
if (length < 0) {
WMSG0(" AWP truncated file\n");
goto bail;
}
lineRecCode = Read8(&srcPtr, &length);
if (length < 0) {
@ -171,7 +179,10 @@ ReformatAWP::ProcessLineRecord(uchar lineRecData, uchar lineRecCode,
/* ignore the horizontal offset for now */
RTFNewPara();
} else if (lineRecCode == kLineRecordText) {
if (pLength > 0)
err = HandleTextRecord(lineRecData, pSrcPtr, pLength);
else
err = -1;
} else if (lineRecCode >= kLineRecordCommandMin &&
lineRecCode <= kLineRecordCommandMax)
{
@ -328,7 +339,7 @@ ReformatAWP::HandleTextRecord(uchar lineRecData,
if (tabFlags == kTabFlagsIsRuler)
noOutput = true;
while (byteCount--) {
while ((*pLength > 0) && (byteCount--)) {
ic = Read8(pSrcPtr, pLength);
if (*pLength < 0) {
err = -1;