Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[EU-FOSSA] Fix stack overflow in XML Parsing

Browse Source
This commit is contained in:
Don HO 2019-01-18 03:50:20 +01:00
parent b9ce848881
commit ccdf7d8d8b
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PowerEditor/src/Notepad_plus.cpp
View File

@ -978,7 +978,7 @@ int Notepad_plus::getHtmlXmlEncoding(const TCHAR *fileName) const
_invisibleEditView.execute(SCI_APPENDTEXT, lenFile, reinterpret_cast<LPARAM>(data)); _invisibleEditView.execute(SCI_APPENDTEXT, lenFile, reinterpret_cast<LPARAM>(data));
const char *encodingAliasRegExpr = "[a-zA-Z0-9_-]+"; const char *encodingAliasRegExpr = "[a-zA-Z0-9_-]+";
const int encodingStrLen = 128;
if (langT == L_XML) if (langT == L_XML)
{ {
// find encoding by RegExpr // find encoding by RegExpr
@ -1004,13 +1004,19 @@ int Notepad_plus::getHtmlXmlEncoding(const TCHAR *fileName) const
startPos = int(_invisibleEditView.execute(SCI_GETTARGETSTART)); startPos = int(_invisibleEditView.execute(SCI_GETTARGETSTART));
endPos = _invisibleEditView.execute(SCI_GETTARGETEND); endPos = _invisibleEditView.execute(SCI_GETTARGETEND);
int len = endPos - startPos;
if (len >= encodingStrLen)
{
return -1;
}
char encodingStr[128]; char encodingStr[encodingStrLen];
_invisibleEditView.getText(encodingStr, startPos, endPos); _invisibleEditView.getText(encodingStr, startPos, endPos);
EncodingMapper *em = EncodingMapper::getInstance(); EncodingMapper *em = EncodingMapper::getInstance();
int enc = em->getEncodingFromString(encodingStr); int enc = em->getEncodingFromString(encodingStr);
return (enc==CP_ACP?-1:enc); return (enc == CP_ACP ? -1 : enc);
} }
return -1; return -1;
} }
@ -1043,12 +1049,18 @@ int Notepad_plus::getHtmlXmlEncoding(const TCHAR *fileName) const
startPos = int(_invisibleEditView.execute(SCI_GETTARGETSTART)); startPos = int(_invisibleEditView.execute(SCI_GETTARGETSTART));
endPos = _invisibleEditView.execute(SCI_GETTARGETEND); endPos = _invisibleEditView.execute(SCI_GETTARGETEND);
char encodingStr[128]; int len = endPos - startPos;
if (len >= encodingStrLen)
{
return -1;
}
char encodingStr[encodingStrLen];
_invisibleEditView.getText(encodingStr, startPos, endPos); _invisibleEditView.getText(encodingStr, startPos, endPos);
EncodingMapper *em = EncodingMapper::getInstance(); EncodingMapper *em = EncodingMapper::getInstance();
int enc = em->getEncodingFromString(encodingStr); int enc = em->getEncodingFromString(encodingStr);
return (enc==CP_ACP?-1:enc); return (enc == CP_ACP ? -1 : enc);
} }
} }