Skip to content

C
core
Kaydet (Commit) 353fd33e authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Fix check for odd nStrLen, as suggested by the comments 

Change-Id: I41fc496c844c7f4a580bb9496bedc14bac70d37d
üst b1d2ec75
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sc/source/core/tool/interpr4.cxx
Dosyayı görüntüle @ 353fd33e
...@@ -696,7 +696,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, ...@@ -696,7 +696,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
// one day, and room for pad byte check. // one day, and room for pad byte check.
if ( aTmp.getLength() > ((sal_uInt16)(~0)) - 2 ) if ( aTmp.getLength() > ((sal_uInt16)(~0)) - 2 )
return false; return false;
// Append a 0-pad-byte if string length is not even // Append a 0-pad-byte if string length is odd
//! MUST be sal_uInt16 and not xub_StrLen //! MUST be sal_uInt16 and not xub_StrLen
sal_uInt16 nStrLen = (sal_uInt16) aTmp.getLength(); sal_uInt16 nStrLen = (sal_uInt16) aTmp.getLength();
sal_uInt16 nLen = ( nStrLen + 2 ) & ~1; sal_uInt16 nLen = ( nStrLen + 2 ) & ~1;
...@@ -711,7 +711,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, ...@@ -711,7 +711,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
memcpy( p, aTmp.getStr(), nStrLen + 1); memcpy( p, aTmp.getStr(), nStrLen + 1);
nPos += 10 + nStrLen + 1; nPos += 10 + nStrLen + 1;
sal_uInt8* q = ( pCellArr + nPos ); sal_uInt8* q = ( pCellArr + nPos );
if( !nStrLen & 1 ) if( (nStrLen & 1) == 0 )
*q++ = 0, nPos++; *q++ = 0, nPos++;
p = (sal_uInt16*) ( pCellArr + nPos ); p = (sal_uInt16*) ( pCellArr + nPos );
nCount++; nCount++;
...@@ -819,7 +819,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, ...@@ -819,7 +819,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
// one day, and room for pad byte check. // one day, and room for pad byte check.
if ( aTmp.getLength() > ((sal_uInt16)(~0)) - 2 ) if ( aTmp.getLength() > ((sal_uInt16)(~0)) - 2 )
return false; return false;
// Append a 0-pad-byte if string length is not even // Append a 0-pad-byte if string length is odd
//! MUST be sal_uInt16 and not xub_StrLen //! MUST be sal_uInt16 and not xub_StrLen
sal_uInt16 nStrLen = (sal_uInt16) aTmp.getLength(); sal_uInt16 nStrLen = (sal_uInt16) aTmp.getLength();
sal_uInt16 nLen = ( nStrLen + 2 ) & ~1; sal_uInt16 nLen = ( nStrLen + 2 ) & ~1;
...@@ -829,7 +829,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, ...@@ -829,7 +829,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
memcpy( p, aTmp.getStr(), nStrLen + 1); memcpy( p, aTmp.getStr(), nStrLen + 1);
nPos += 2 + nStrLen + 1; nPos += 2 + nStrLen + 1;
sal_uInt8* q = ( pCellArr + nPos ); sal_uInt8* q = ( pCellArr + nPos );
if( !nStrLen & 1 ) if( (nStrLen & 1) == 0 )
*q++ = 0, nPos++; *q++ = 0, nPos++;
} }
nCount++; nCount++;
......
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