Kaydet (Commit) aa7c6ccc authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz#9910 Direct-leak

Change-Id: I14e5fbf8e572e9ea1fd8779434fd46ed43caac2c
Reviewed-on: https://gerrit.libreoffice.org/59069
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 94f99ad3
......@@ -112,7 +112,6 @@ void LwpGraphicObject::Read()
m_sDataFormat[strsize] = '\0';
}
sal_uInt32 nServerContextSize = m_pObjStrm->QuickReaduInt32();
unsigned char *pServerContext = nullptr;
if (nServerContextSize > 0)
{
sal_uInt16 nMaxPossibleSize = m_pObjStrm->remainingSize();
......@@ -123,16 +122,16 @@ void LwpGraphicObject::Read()
nServerContextSize = nMaxPossibleSize;
}
pServerContext = new unsigned char[nServerContextSize];
m_pObjStrm->QuickRead(pServerContext, static_cast<sal_uInt16>(nServerContextSize));
std::vector<unsigned char> aServerContext(nServerContextSize);
m_pObjStrm->QuickRead(aServerContext.data(), static_cast<sal_uInt16>(nServerContextSize));
if (nServerContextSize > 44)
{
m_aIPData.nBrightness = pServerContext[14];
m_aIPData.nContrast = pServerContext[19];
m_aIPData.nEdgeEnchancement = pServerContext[24];
m_aIPData.nSmoothing = pServerContext[29];
m_aIPData.bInvertImage = (pServerContext[34] == 0x01);
m_aIPData.bAutoContrast = (pServerContext[44] == 0x00);
m_aIPData.nBrightness = aServerContext[14];
m_aIPData.nContrast = aServerContext[19];
m_aIPData.nEdgeEnchancement = aServerContext[24];
m_aIPData.nSmoothing = aServerContext[29];
m_aIPData.bInvertImage = (aServerContext[34] == 0x01);
m_aIPData.bAutoContrast = (aServerContext[44] == 0x00);
}
}
m_pObjStrm->QuickReaduInt16(); //disksize
......@@ -153,7 +152,6 @@ void LwpGraphicObject::Read()
}
m_nCachedBaseLine = m_pObjStrm->QuickReadInt32();
m_bIsLinked = m_pObjStrm->QuickReadInt16();
unsigned char * pFilterContext = nullptr;
if (m_bIsLinked)
{
......@@ -170,8 +168,8 @@ void LwpGraphicObject::Read()
nFilterContextSize = nMaxPossibleSize;
}
pFilterContext = new unsigned char[nFilterContextSize];
m_pObjStrm->QuickRead(pFilterContext, static_cast<sal_uInt16>(nFilterContextSize));
std::vector<unsigned char> aFilterContext(nFilterContextSize);
m_pObjStrm->QuickRead(aFilterContext.data(), static_cast<sal_uInt16>(nFilterContextSize));
}
if (LwpFileHeader::m_nFileRevision >= 0x000b)
{
......@@ -200,9 +198,6 @@ void LwpGraphicObject::Read()
{
m_WatermarkName = m_pObjStrm->QuickReadStringPtr();
}
delete[] pServerContext;
delete[] pFilterContext;
}
void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment