diff -r 3f7d9dbe57c8 -r 57a65a3a658c syncmlfw/common/sosserver/src/nsmlsossession.cpp --- a/syncmlfw/common/sosserver/src/nsmlsossession.cpp Tue Feb 02 00:44:00 2010 +0200 +++ b/syncmlfw/common/sosserver/src/nsmlsossession.cpp Fri Feb 19 23:41:35 2010 +0200 @@ -461,6 +461,7 @@ if ( !iDMAuthInfo ) { aMessage.Complete( KErrNotFound ); + return; } aMessage.WriteL( 0, iDMAuthInfo->Ptr(0), 0 ); aMessage.Complete( KErrNone ); @@ -1545,6 +1546,7 @@ if ( !log ) { aMessage.Complete( KErrBadHandle ); + return; } log->ResetL(); aMessage.Complete(KErrNone); @@ -2233,16 +2235,16 @@ break; }; - - if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer - { - iProgressEventBuffer.Remove(0); - } - - delete buf; - buf = NULL; - - + if ( buf ) + { + if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer + { + iProgressEventBuffer.Remove(0); + } + + delete buf; + buf = NULL; + } } if ( !mutexError ) @@ -2307,14 +2309,16 @@ iProgressEventBuffer.Remove(0); } */ - if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer - { - iContactSuiteProgressEventBuffer.Remove(0); - } + if ( buf ) + { + if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer + { + iContactSuiteProgressEventBuffer.Remove(0); + } - delete buf; - buf = NULL; - + delete buf; + buf = NULL; + } }