Skip to content

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

coverity#1415614 Out-of-bounds read 

Change-Id: I73d18dd6613be063002878fb4906a49863707856
üst 1d663165
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
sw/source/core/doc/DocumentStylePoolManager.cxx
Dosyayı görüntüle @ f7c4e8cb
......@@ -1380,18 +1380,16 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
pDeriveFormat = m_rDoc.GetDfltCharFormat();
pWhichRange = aCharFormatSetRange;
// Fault: unknown Format, but a CharFormat
// -> return the first one
if( RES_POOLCHR_BEGIN > nId || nId >= RES_POOLCHR_END )
if (nId >= RES_POOLCHR_HTML_BEGIN && nId < RES_POOLCHR_HTML_END)
pRCId = STR_POOLCHR_HTML_ARY[nId - RES_POOLCHR_HTML_BEGIN];
else if (nId >= RES_POOLCHR_NORMAL_BEGIN && nId < RES_POOLCHR_NORMAL_END)
pRCId = STR_POOLCHR_ARY[nId - RES_POOLCHR_BEGIN];
else
{
// Fault: unknown Format, but a CharFormat -> return the first one
OSL_ENSURE( false, "invalid Id" );
nId = RES_POOLCHR_BEGIN;
pRCId = STR_POOLCHR_ARY[0];
}
if (nId > RES_POOLCHR_NORMAL_END)
pRCId = STR_POOLCHR_HTML_ARY[nId - RES_POOLCHR_HTML_BEGIN];
else
pRCId = STR_POOLCHR_ARY[nId - RES_POOLCHR_BEGIN];
}
break;
case POOLGRP_FRAMEFMT:
......
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