--- a/installationservices/swinstallationfw/source/sifcommon.cpp Fri Sep 03 17:01:40 2010 +0300
+++ b/installationservices/swinstallationfw/source/sifcommon.cpp Tue Sep 28 14:48:39 2010 +0300
@@ -587,7 +587,7 @@
void COpaqueNamedParams::VerifyExternalizedSizeForNewParamArrayL(TInt aNameSize, TInt aValueSize) const
{
const TInt load = 2*sizeof(TInt) + aNameSize + aValueSize;
- if (aNameSize > KMaxOpaqueParamsDescriptorSize || iExternalizedSize + load > KMaxOpaqueParamsExternalizedSize)
+ if (aNameSize > KMaxOpaqueParamNameDescriptorSize || iExternalizedSize + load > KMaxOpaqueParamsExternalizedSize)
{
User::Leave(KErrOverflow);
}
@@ -944,7 +944,7 @@
void CItemBase::VerifyExternalizedSizeForParamL(TUint aValueSize) const
{
- if(aValueSize > KMaxOpaqueParamsDescriptorSize)
+ if(aValueSize > KMaxOpaqueParamValueDescriptorSize)
{
User::Leave(KErrOverflow);
}
@@ -959,7 +959,7 @@
void CItemBase::InternalizeL (RReadStream& aStream)
{
delete iName;
- iName = HBufC::NewL(aStream, KMaxOpaqueParamsDescriptorSize);
+ iName = HBufC::NewL(aStream, KMaxOpaqueParamNameDescriptorSize);
iSize = aStream.ReadInt32L();
}
@@ -1013,7 +1013,7 @@
{
CItemBase::InternalizeL(aStream);
DeleteObjectZ(iString);
- iString = HBufC::NewL(aStream, KMaxOpaqueParamsDescriptorSize);
+ iString = HBufC::NewL(aStream, KMaxOpaqueParamValueDescriptorSize);
}
const TDesC& CStringItem::StringValue() const