Skip to content

C
core
Kaydet (Commit) 2aadad1e authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

guard against 0 item size 

Change-Id: I9c4c2f0fe2d892615b3c70e08da0cab6da13338a
üst 1847753a
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
sd/source/filter/ppt/propread.cxx
Dosyayı görüntüle @ 2aadad1e
......@@ -93,7 +93,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
{
case VT_LPSTR :
{
if ( nItemSize )
if (nItemSize)
{
auto nMaxSizePossible = remainingSize();
if (nItemSize > nMaxSizePossible)
......@@ -101,6 +101,10 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
SAL_WARN("sd.filter", "String of Len " << nItemSize << " claimed, only " << nMaxSizePossible << " possible");
nItemSize = nMaxSizePossible;
}
}
if (nItemSize)
{
try
{
sal_Char* pString = new sal_Char[ nItemSize ];
......@@ -144,7 +148,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
case VT_LPWSTR :
{
if ( nItemSize )
if (nItemSize)
{
auto nMaxSizePossible = remainingSize() / sizeof(sal_Unicode);
if (nItemSize > nMaxSizePossible)
......@@ -152,7 +156,10 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
SAL_WARN("sd.filter", "String of Len " << nItemSize << " claimed, only " << nMaxSizePossible << " possible");
nItemSize = nMaxSizePossible;
}
}
if (nItemSize)
{
try
{
sal_Unicode* pString = new sal_Unicode[ nItemSize ];
......
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