mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz: avoid oom

Browse Source 
Change-Id: Icbd4b98e8a0a4aff967bae22f3f59248ed40598a
Reviewed-on: https://gerrit.libreoffice.org/36049
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-04-03 16:41:24 +01:00
parent 6b4a149a65
commit aec5912b13
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sw/source/filter/ww8/ww8par.cxx
View File

@@ -2951,6 +2951,20 @@ sal_Unicode SwWW8ImplReader::TranslateToHindiNumbers(sal_Unicode nChar)
return nChar; return nChar;
} }
namespace
{
OUString makeOUString(rtl_uString *pStr, sal_Int32 nAllocLen)
{
//if read len was in or around that of allocated len, just reuse pStr
if (nAllocLen < pStr->length + 256)
return OUString(pStr, SAL_NO_ACQUIRE);
//otherwise copy the shorter used section to release extra mem
OUString sRet(pStr->buffer, pStr->length);
rtl_uString_release(pStr);
return sRet;
}
}
/** /**
* Return value: true for non special chars * Return value: true for non special chars
*/ */
@@ -3125,7 +3139,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
pStr->buffer[nEndUsed] = 0; pStr->buffer[nEndUsed] = 0;
pStr->length = nEndUsed; pStr->length = nEndUsed;
emulateMSWordAddTextToParagraph(OUString(pStr, SAL_NO_ACQUIRE)); emulateMSWordAddTextToParagraph(makeOUString(pStr, nStrLen));
pStr = nullptr; pStr = nullptr;
rPos += nL2; rPos += nL2;
if (!m_aApos.back()) // a para end in apo doesn't count if (!m_aApos.back()) // a para end in apo doesn't count