diff -r bf573002ff72 -r aba12c885d83 pimappservices/calendar/server/src/agssess.cpp --- a/pimappservices/calendar/server/src/agssess.cpp Mon Jun 21 15:38:59 2010 +0300 +++ b/pimappservices/calendar/server/src/agssess.cpp Thu Jul 15 18:37:27 2010 +0300 @@ -2066,6 +2066,16 @@ // Restore length const TInt KBufferSize = iMessage.GetDesLength(KSlot2); + if (KBufferSize == KErrArgument) + { + PanicClientL(EIndexError); + } + else if (KBufferSize == KErrBadDescriptor) + { + PanicClientL(EBadDescriptor); + } + User::LeaveIfError(KBufferSize); + // Restore buffer CBufFlat* buffer = CBufFlat::NewL(KBufferSize); CleanupStack::PushL(buffer);