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

CID#1079181 initialize buffer

Change-Id: I516aedd445c8fcd4cefed1ed23d5bf8157b200a6
Reviewed-on: https://gerrit.libreoffice.org/5889Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e79f590e
...@@ -185,8 +185,9 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con ...@@ -185,8 +185,9 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con
{ {
sal_uInt8 nFmla[ nBufSize ], i, nArg, nArgArray[ nBufSize ]; sal_uInt8 nFmla[ nBufSize ], i, nArg, nArgArray[ nBufSize ];
sal_Int8 nCol, nPage; sal_Int8 nCol, nPage;
sal_uInt16 nInt, nIntCount = 0, nStringCount = 0, nFloatCount = 0, nDLLCount = 0, nIntArray[ nBufSize ], nArgCount = 0; sal_uInt16 nInt, nIntCount = 0, nStringCount = 0, nFloatCount = 0, nDLLCount = 0, nArgCount = 0;
String sStringArray[ nBufSize ]; sal_uInt16 nIntArray[ nBufSize ] = {0};
OUString sStringArray[ nBufSize ];
sal_uInt16 nDummy, nDLLId, nDLLArray[ nBufSize ]; sal_uInt16 nDummy, nDLLId, nDLLArray[ nBufSize ];
sal_uInt16 nNote, nRef, nRelBits; sal_uInt16 nNote, nRef, nRelBits;
TokenId nPush; TokenId nPush;
...@@ -211,7 +212,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con ...@@ -211,7 +212,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con
{ {
maIn >> nInt; maIn >> nInt;
nIntArray[ nIntCount ] = nInt; nIntArray[ nIntCount ] = nInt;
SAFEDEC_OR_RET(nRef, 2, ConvErrCount); SAFEDEC_OR_RET(nRef, 2, ConvErrCount);
nIntCount++; nIntCount++;
} }
...@@ -219,7 +220,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con ...@@ -219,7 +220,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con
{ {
maIn >> nFloat; maIn >> nFloat;
nFloatArray[ nFloatCount ] = nFloat; nFloatArray[ nFloatCount ] = nFloat;
SAFEDEC_OR_RET(nRef, 8, ConvErrCount); SAFEDEC_OR_RET(nRef, 8, ConvErrCount);
nFloatCount++; nFloatCount++;
} }
...@@ -228,16 +229,16 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con ...@@ -228,16 +229,16 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con
maIn >> nArg >> nDummy >> nDLLId; maIn >> nArg >> nDummy >> nDLLId;
nArgArray[ nArgCount ] = nArg; nArgArray[ nArgCount ] = nArg;
nDLLArray[ nDLLCount ] = nDLLId; nDLLArray[ nDLLCount ] = nDLLId;
SAFEDEC_OR_RET(nRef, 5, ConvErrCount); SAFEDEC_OR_RET(nRef, 5, ConvErrCount);
nDLLCount++; nDLLCount++;
nArgCount++; nArgCount++;
} }
if( nFmla[ i ] == 0x06 ) if( nFmla[ i ] == 0x06 )
{ {
String aTmp(::read_zeroTerminated_uInt8s_ToOUString(maIn, maIn.GetStreamCharSet())); OUString aTmp(::read_zeroTerminated_uInt8s_ToOUString(maIn, maIn.GetStreamCharSet()));
sStringArray[ nStringCount ] = aTmp; sStringArray[ nStringCount ] = aTmp;
nStringCount++; nStringCount++;
SAFEDEC_OR_RET(nRef, aTmp.Len() + 1, ConvErrCount); SAFEDEC_OR_RET(nRef, aTmp.getLength() + 1, ConvErrCount);
} }
} }
} }
...@@ -350,8 +351,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con ...@@ -350,8 +351,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con
break; break;
case FT_ConstString:{ case FT_ConstString:{
String aLabel; OUString aLabel(sStringArray[ nStringCount ]);
aLabel = sStringArray[ nStringCount ];
aStack << aPool.Store( aLabel ); aStack << aPool.Store( aLabel );
nStringCount++; nStringCount++;
} }
......
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