diff -r b183ec05bd8c -r 19bba8228ff0 syncmlfw/common/sosserver/src/nsmlsossession.cpp --- a/syncmlfw/common/sosserver/src/nsmlsossession.cpp Tue Aug 31 16:04:06 2010 +0300 +++ b/syncmlfw/common/sosserver/src/nsmlsossession.cpp Wed Sep 01 12:27:42 2010 +0100 @@ -461,7 +461,6 @@ if ( !iDMAuthInfo ) { aMessage.Complete( KErrNotFound ); - _DBG_FILE("CNSmlSOSSession::GetDMAuthInfoL(): iDMAuthInfo is NULL"); return; } aMessage.WriteL( 0, iDMAuthInfo->Ptr(0), 0 ); @@ -2236,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 ) @@ -2310,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; + } }