Skip to content

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

asan: global-buffer-overflow on ooo12093-1.doc 

Change-Id: I5e29626fe2803d2751bdec9c6919662ea37cf64c
üst c23bed10
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
sw/source/filter/ww8/ww8par.cxx
Dosyayı görüntüle @ 201f9991
...@@ -5025,7 +5025,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) ...@@ -5025,7 +5025,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
aInfo.ePos = FTNPOS_PAGE; aInfo.ePos = FTNPOS_PAGE;
aInfo.eNum = eNumA[pWDop->rncFtn]; aInfo.eNum = eNumA[pWDop->rncFtn];
aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[pWDop->nfcFtnRef]) ); sal_uInt16 nfcFtnRef = pWDop->nfcFtnRef & 0xF;
aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[nfcFtnRef]) );
if( pWDop->nFtn ) if( pWDop->nFtn )
aInfo.nFtnOffset = pWDop->nFtn - 1; aInfo.nFtnOffset = pWDop->nFtn - 1;
rDoc.SetFtnInfo( aInfo ); rDoc.SetFtnInfo( aInfo );
...@@ -5034,8 +5035,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) ...@@ -5034,8 +5035,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
{ {
SwEndNoteInfo aInfo; SwEndNoteInfo aInfo;
aInfo = rDoc.GetEndNoteInfo(); // Same as for Ftn aInfo = rDoc.GetEndNoteInfo(); // Same as for Ftn
sal_uInt16 nfcEdnRef = pWDop->nfcEdnRef & 0xF;
aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[pWDop->nfcEdnRef]) ); aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[nfcEdnRef]) );
if( pWDop->nEdn ) if( pWDop->nEdn )
aInfo.nFtnOffset = pWDop->nEdn - 1; aInfo.nFtnOffset = pWDop->nEdn - 1;
rDoc.SetEndNoteInfo( aInfo ); rDoc.SetEndNoteInfo( aInfo );
......
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