diff -r 4697dfb2d7ad -r 238255e8b033 messagingappbase/obexmtms/obexmtm/obexutil/source/ObexSdpUtils.cpp --- a/messagingappbase/obexmtms/obexmtm/obexutil/source/ObexSdpUtils.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/obexmtm/obexutil/source/ObexSdpUtils.cpp Fri Apr 16 14:56:15 2010 +0300 @@ -185,8 +185,9 @@ delete iSdpAgent; } - - iAttributeArray->ResetAndDestroy(); + + if(iAttributeArray) + iAttributeArray->ResetAndDestroy(); delete iAttributeArray; } @@ -305,7 +306,7 @@ || (iExpectedType==EAnythingUntilNextExpectedValue) //we should have got whatever we expected next! || (iExpectedType==EUint) //we should always get the Uint we are looking for || (iExpectedType==EUUID) //we should always get the UUID we are looking for - || (aError)) //an error has occured, note that not finding an attribute does NOT result in KErrNotFound + || (aError)) //an error has occurred, note that not finding an attribute does NOT result in KErrNotFound { // following is an exception to the rules above... if (iCurrentAttributeId==KBluetoothProfileDescriptorListAttributeId) //it OK to not find what we expect in for attribute because attribute is not mandatory @@ -383,12 +384,12 @@ { if (aUUID != TUUID(iExpectedValue)) { - // Havn't got what we expected! + // Haven't got what we expected! iNotThisSdpRecord = ETrue; } else if (aUUID==TUUID(KObexObjectPushUUIDValue) && iCurrentAttributeId==KBluetoothProfileDescriptorListAttributeId) { - // remote device complies fully with obex object push profile + // Remote device complies fully with obex object push profile iFullComplianceWithObexObjectPush = ETrue;; } } @@ -444,7 +445,7 @@ { if (uint != iExpectedValue) { - // Havn't got what we expected! + // haven't got what we expected! iNotThisSdpRecord = ETrue; } }