--- a/atext/server/inc/atextmetadata.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/atext/server/inc/atextmetadata.h	Wed Oct 13 16:20:29 2010 +0300
@@ -324,7 +324,7 @@
 public:
 
     TATExtEntrySupport( TDesC8& aAtCmdFull,
-                        const RMessage2& aMessage,
+                        RMessage2& aMessage,
                         CArrayFixFlat<TATExtOneCmdSupport>* aSupport ) :
                         iAtCmdFull( aAtCmdFull ),
                         iMessage( aMessage ),
@@ -333,6 +333,8 @@
                         iStartIndex( KErrNotFound ),
                         iSupportFound( EFalse ){}
 
+    TATExtEntrySupport& operator=( TATExtEntrySupport& aEntrySupport );
+    
     /**
      * Full AT command for which to check the support
      * (base part + parameters)
@@ -342,7 +344,7 @@
     /**
      * Client request message for reading
      */
-    const RMessage2& iMessage;
+    RMessage2& iMessage;
 
     /**
      * AT command's plugin entry support data.
@@ -365,7 +367,7 @@
      * Found plugin support for HandlePartialAndMasterPluginSupportL().
      */
     TBool iSupportFound;
-
+    
     };
 
 /**

--- a/atext/server/inc/utils.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/atext/server/inc/utils.h	Wed Oct 13 16:20:29 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -46,6 +46,23 @@
     {CleanupResetDestroyClose<T>::PushL(aRef);}
 
 template <class T>
+class CleanupDeleteAndNull
+    {
+public:
+    inline static void PushL(T*& aRef) {CleanupStack::PushL(TCleanupItem(&DeleteAndNull,&aRef));};
+private:
+    static void DeleteAndNull(TAny *aPtr) {T*& ptr = *static_cast<T**>(aPtr); delete ptr; ptr = NULL;};
+    };
+
+/**
+ * Pushes an object into CleanupStack and specifies the cleanup
+ * function as delete followed by NULLing the pointer reference.
+*/
+template <class T>
+inline void CleanupDeleteAndNullPushL(T*& aRef)
+    {CleanupDeleteAndNull<T>::PushL(aRef);}
+
+template <class T>
 static TBool OperatorEqual(const T& aT1, const T& aT2)
     {
     return aT1 == aT2;

--- a/atext/server/src/atextmetadata.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/atext/server/src/atextmetadata.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -1529,7 +1529,6 @@
         aCleanupInfo.iEntryCreated = ETrue;
         aCleanupInfo.iEntryIndex = iPluginData->Count() - 1;
         foundIndex = aCleanupInfo.iEntryIndex;
-        foundEntry = &(*iPluginData)[foundIndex];
         }
     // Now foundEntry is either the found entry or a newly added entry.
     // Make the iSupport metadata point to this.
@@ -1565,9 +1564,12 @@
         TRACE_FUNC_EXIT
         User::Leave( KErrGeneral );
         }
+    TBool createdEntries = EFalse;
     if ( !aEntries )
         {
         aEntries = new (ELeave) CArrayFixFlat<TATExtOneCmdSupport>( KGranularity );
+        CleanupDeleteAndNullPushL( aEntries ); // we can't expect the caller to do this as they don't know about it yet
+        createdEntries = ETrue;
         }
     TATExtOneCmdSupport oneCmdSupport;
     oneCmdSupport.iSupportType = aSupportType;
@@ -1601,6 +1603,11 @@
             User::Leave( KErrNotSupported );
             }
         }
+    if ( createdEntries )
+        {
+        // ownership is transferred to the caller
+        CleanupStack::Pop( aEntries );
+        }
     TRACE_FUNC_EXIT
     return retVal;
     }
@@ -1996,21 +2003,40 @@
     TRACE_FUNC_ENTRY
     // First extract the base of AT command from aAtCmdFull
     // ('=' and everything after that)
-    TInt newLength = aAtCmdFull.Length();
+    TInt fullLength = aAtCmdFull.Length();
+    TInt newLength = fullLength;
+    TInt findIndex = KErrNotFound;
     TInt foundPos = aAtCmdFull.Locate( '=' );
-    if ( foundPos >= 2 )  // After "AT"
+    TRACE_INFO(( _L8("Base length before = %d"), fullLength ));
+    if ( foundPos >= 0 )
         {
+        findIndex = foundPos - 1;
         newLength = foundPos;
+        TRACE_INFO(( _L8("Adjust case 1 = %d/%d"), findIndex, newLength ));
         }
-    else if ( newLength >= 1 )
+    else
         {
         // There was no '=' so check if the last character is '?'.
         // If it is then remove it.
-        if ( aAtCmdFull[newLength-1] == '?' )
+        TInt lastIndex = fullLength - 1;
+        if ( aAtCmdFull[lastIndex] == '?' )
             {
-            newLength--;
+            findIndex = lastIndex - 1;
+            newLength = fullLength - 1;
+            }
+        TRACE_INFO(( _L8("Adjust case 2 = %d/%d"), findIndex, newLength ));
+        }
+    // Next correct newLength so that it doesn't contain the space(s)
+    for ( ; findIndex>=0; findIndex--,newLength-- )
+        {
+        TChar character = aAtCmdFull[findIndex];
+        if ( !(character.IsSpace()||character==0x00) )
+            {
+            break;
             }
         }
+    // The following should tolerate also zero length
+    TRACE_INFO(( _L8("Base length after = %d"), newLength ));
     HBufC8* baseCmd = HBufC8::NewMaxLC( newLength );
     TPtr8 baseCmdPtr = baseCmd->Des();
     baseCmdPtr.Copy( &aAtCmdFull[0], newLength );
@@ -2045,11 +2071,12 @@
         aComplInfo.iProcessed = EFalse;
         aComplInfo.iReplyExpected = ETrue;
         CreateSelfReplyData( aMessage );
-        CleanupStack::PopAndDestroy();
         TRACE_FUNC_EXIT
         return;
         }
-    TATExtEntrySupport entrySupport( aAtCmdFull, aMessage, support );
+    TATExtEntrySupport entrySupport( aAtCmdFull,
+                                     const_cast<RMessage2&>(aMessage),
+                                     support );
     TInt i;
     aComplInfo.iProcessed = EFalse;
     TInt count = support->Count();
@@ -2141,11 +2168,14 @@
     HBufC8* atCmdFull = HBufC8::NewMaxLC( aEntrySupport.iAtCmdFull.Length() );
     TPtr8 atCmdFullPtr = atCmdFull->Des();
     atCmdFullPtr.Copy( aEntrySupport.iAtCmdFull );
+    // First send the entry to the observers
+    TATExtEntrySupport handleCommandEntry = aEntrySupport;
+    aEntrySupport.iStartIndex = aStartIndex;
+    SendToMultipleObserverL( aEntrySupport, atCmdFull );
+    aEntrySupport = handleCommandEntry;
     // Now execute the HandleCommand()
     iCmdData.iReplyExpected = ETrue;  // Set before HandleCommandL()
     HandleCommandL( aEntrySupport, ETrue );
-    aEntrySupport.iStartIndex = aStartIndex;
-    SendToMultipleObserverL( aEntrySupport, atCmdFull );
     CleanupStack::PopAndDestroy( atCmdFull );
     aReplyExpected = ETrue;
     TRACE_FUNC_EXIT
@@ -2187,8 +2217,8 @@
         TPtr8 atCmdFullPtr = atCmdFull->Des();
         atCmdFullPtr.Copy( aEntrySupport.iAtCmdFull );
         // Now execute the HandleCommand()
+        SendToMultipleObserverL( nextSupport, atCmdFull );
         HandleCommandL( aEntrySupport, EFalse );
-        SendToMultipleObserverL( nextSupport, atCmdFull );
         CleanupStack::PopAndDestroy( atCmdFull );
         }
     else
@@ -2289,6 +2319,7 @@
         TRACE_FUNC_EXIT
         return support;
         }
+    CleanupStack::PopAndDestroy( support );
     TRACE_FUNC_EXIT
     return NULL;
     }
@@ -2727,3 +2758,22 @@
     TRACE_FUNC_EXIT
     return KErrNone;
     }
+
+// ---------------------------------------------------------------------------
+// Assignment operator for ease of usage
+// ---------------------------------------------------------------------------
+//
+TATExtEntrySupport& TATExtEntrySupport::operator=( TATExtEntrySupport& aEntrySupport )
+    {
+    if ( &aEntrySupport == this )
+        {
+        return aEntrySupport;
+        }
+    iAtCmdFull = aEntrySupport.iAtCmdFull;
+    iMessage = aEntrySupport.iMessage;
+    iSupport = aEntrySupport.iSupport;
+    iEntry = aEntrySupport.iEntry;
+    iStartIndex = aEntrySupport.iStartIndex;
+    iSupportFound = aEntrySupport.iSupportFound;
+    return *this;
+    }

--- a/atext/server/src/atextsession.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/atext/server/src/atextsession.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -898,6 +898,7 @@
     if ( iEComSession )
         {
         iEComSession->Close();
+        iEComSession = NULL; 
         }
     if ( !aSyncClose )
         {

--- a/bluetooth/btcomm/src/states.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btcomm/src/states.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -625,6 +625,12 @@
 
 	key.iStateLength = 0;
 
+	// Coverity[uninit_use_in_call]
+	// This refers to the elements in the continuation state key. 
+	// However iStateLength is the expected length of that continaution state key, 
+	// which here has been set to zero - indicating the query is too short to 
+	// require continuation. Hence no elements in this continuation state need 
+	// initialising.
 	aContext->iSDPRequest.Copy(TSDPServiceSearchKeyBuf(key));
 	aContext->iSDPServRecordHandle.SetMax(); 
 	netdb.Query(aContext->iSDPRequest,aContext->iSDPServRecordHandle,aContext->iStatus);

--- a/bluetooth/btlogger/generic/public/components.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btlogger/generic/public/components.h	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -24,15 +24,6 @@
 // This file provides a centralised place for the definition
 // of log component strings for use with the Bluetooth logger.
 
-// The Bluetooth PRT
-#define LOG_COMPONENT_BT_PRT				"BtPrt"
-
-// Class of Device (CoD) Service Manager
-#define LOG_COMPONENT_BT_COD				"CoD"
-
-// Incoming connection listener
-#define LOG_COMPONENT_IN_CONN_LISTENER		"InConnListener"
-
 // The Bluetooth Logger
 #define LOG_COMPONENT_LOGGER				"LogEngine"
 
@@ -61,6 +52,12 @@
 #define LOG_COMPONENT_HCI_WATCHDOG			"HciWatchdog"
 
 // Bluetooth Stack Components
+//// The common Bluetooth protocol components
+#define LOG_COMPONENT_BT_PRT				"BtPrt"
+//// Class of Device (CoD) Service Manager
+#define LOG_COMPONENT_BT_COD				"CoD"
+//// Incoming connection listener
+#define LOG_COMPONENT_IN_CONN_LISTENER		"InConnListener"
 #define LOG_COMPONENT_SECMAN				"SecMan"
 #define LOG_COMPONENT_HOSTRESOLVER			"HostResolver"
 #define LOG_COMPONENT_LINKMGR				"LinkMgr"

--- a/bluetooth/btlogger/generic/public/logger.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btlogger/generic/public/logger.h	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -59,6 +59,7 @@
 #ifdef __FLOG_ACTIVE
 #define CONNECT_LOGGER					static_cast<void>(CBtLog::Connect());
 #define CLOSE_LOGGER					CBtLog::Close();
+#define DEFINE_LOG_COMPONENT(a)			_LIT8(KLogComponent, a);
 #define LEAVEIFERRORL(a)				VerboseLeaveIfErrorL(KLogComponent, __FILE__, __LINE__, a)
 #define LEAVEL(a)						VerboseLeaveL(KLogComponent, __FILE__, __LINE__, a)
 #define PANIC(CAT, CODE) 				VerbosePanic(KLogComponent, __FILE__, __LINE__, CODE, (TText8*)#CODE, CAT)
@@ -81,6 +82,7 @@
 #else
 #define CONNECT_LOGGER
 #define CLOSE_LOGGER
+#define DEFINE_LOG_COMPONENT(a)
 #define LEAVEIFERRORL(a)				static_cast<void>(User::LeaveIfError(a))
 #define LEAVEL(a)						User::Leave(a)
 #define PANIC(CAT, CODE) 				User::Panic(CAT, CODE)
@@ -141,6 +143,9 @@
 
 // We want a 10-character string (but allow for the NULL terminator).
 #define PANICCATEGORY(aaa) __ASSERT_COMPILE(sizeof(L##aaa)/2 <= 11); _LIT(KMungedPanicCat, aaa) 
+#define PANIC_CATEGORY(aaa) PANICCATEGORY(aaa);
+
+#define DEBUG_PANIC_CATEGORY(aaa) __DEBUG_ONLY(PANICCATEGORY(aaa);)
 
 // A handy panic-self macro- the category is whatever has been declared with 
 // BTPANICCATEGORY, with " line#" appended. The panic code is the line number. 

--- a/bluetooth/btsdp/BWINS/SDPDATABASEU.DEF	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btsdp/BWINS/SDPDATABASEU.DEF	Wed Oct 13 16:20:29 2010 +0300
@@ -26,7 +26,7 @@
 	?AppendValueL@CSdpAttrValueList@@QAEXPAVCSdpAttrValue@@@Z @ 25 NONAME ; void CSdpAttrValueList::AppendValueL(class CSdpAttrValue *)
 	?At@CSdpSearchPattern@@QBE?BVTUUID@@H@Z @ 26 NONAME ; class TUUID const CSdpSearchPattern::At(int) const
 	?AttrCount@CSizeAccumulator@@QAEHH@Z @ 27 NONAME ; int CSizeAccumulator::AttrCount(int)
-	?AttributeOf@CSizeAccumulator@@QAEPAVCAttrSizeItem@@HH@Z @ 28 NONAME ; class CAttrSizeItem * CSizeAccumulator::AttributeOf(int, int)
+	?AttributeOf@CSizeAccumulator@@QAEPAVTAttrSizeItem@@HH@Z @ 28 NONAME ; class TAttrSizeItem * CSizeAccumulator::AttributeOf(int, int)
 	?BufferedParseL@CElementParser@@QAEHABVTDesC8@@@Z @ 29 NONAME ; int CElementParser::BufferedParseL(class TDesC8 const &)
 	?BuildBooleanL@CSdpAttrValueList@@UAEPAVMSdpElementBuilder@@H@Z @ 30 NONAME ABSENT ; class MSdpElementBuilder * CSdpAttrValueList::BuildBooleanL(int)
 	?BuildBooleanL@MSdpElementBuilder@@UAEPAV1@H@Z @ 31 NONAME ; class MSdpElementBuilder * MSdpElementBuilder::BuildBooleanL(int)
@@ -50,7 +50,7 @@
 	?BuildUnknownL@CSdpAttrValueList@@UAEPAVMSdpElementBuilder@@EEABVTDesC8@@@Z @ 49 NONAME ABSENT ; class MSdpElementBuilder * CSdpAttrValueList::BuildUnknownL(unsigned char, unsigned char, class TDesC8 const &)
 	?BuildUnknownL@MSdpElementBuilder@@UAEPAV1@EEABVTDesC8@@@Z @ 50 NONAME ; class MSdpElementBuilder * MSdpElementBuilder::BuildUnknownL(unsigned char, unsigned char, class TDesC8 const &)
 	?Builder@CElementParser@@QAEPAVMSdpElementBuilder@@XZ @ 51 NONAME ; class MSdpElementBuilder * CElementParser::Builder(void)
-	?CHandleItemL@CHandleItem@@SAPAV1@KPAVCSdpServRecord@@@Z @ 52 NONAME ; class CHandleItem * CHandleItem::CHandleItemL(unsigned long, class CSdpServRecord *)
+	?CHandleItemL@CHandleItem@@SAPAV1@KPAVCSdpServRecord@@@Z @ 52 NONAME ABSENT ; class CHandleItem * CHandleItem::CHandleItemL(unsigned long, class CSdpServRecord *)
 	?ClientUid@CSdpServRecord@@QBE?AVTUid@@XZ @ 53 NONAME ; class TUid CSdpServRecord::ClientUid(void) const
 	?Close@RSdpDatabase@@UAEXXZ @ 54 NONAME ; void RSdpDatabase::Close(void)
 	?Connect@RSdp@@QAEHXZ @ 55 NONAME ; int RSdp::Connect(void)
@@ -91,7 +91,7 @@
 	?NewEncodedL@CSdpAttrValueEncoded@@SAPAV1@ABVTDesC8@@@Z @ 90 NONAME ; class CSdpAttrValueEncoded * CSdpAttrValueEncoded::NewEncodedL(class TDesC8 const &)
 	?NewIntL@CSdpAttrValueInt@@SAPAV1@ABVTDesC8@@@Z @ 91 NONAME ; class CSdpAttrValueInt * CSdpAttrValueInt::NewIntL(class TDesC8 const &)
 	?NewL@CElementParser@@SAPAV1@PAVMSdpElementBuilder@@@Z @ 92 NONAME ; class CElementParser * CElementParser::NewL(class MSdpElementBuilder *)
-	?NewL@CHandleItem@@SAPAV1@XZ @ 93 NONAME ; class CHandleItem * CHandleItem::NewL(void)
+	?NewL@CHandleItem@@SAPAV1@XZ @ 93 NONAME ABSENT ; class CHandleItem * CHandleItem::NewL(void)
 	?NewL@CResponseSizeVisitor@@CAPAV1@XZ @ 94 NONAME ABSENT ; class CResponseSizeVisitor * CResponseSizeVisitor::NewL(void)
 	?NewL@CSdpAttr@@SAPAV1@GPAVMSdpElementBuilder@@@Z @ 95 NONAME ; class CSdpAttr * CSdpAttr::NewL(unsigned short, class MSdpElementBuilder *)
 	?NewL@CSdpAttrIdMatchList@@SAPAV1@ABV1@@Z @ 96 NONAME ; class CSdpAttrIdMatchList * CSdpAttrIdMatchList::NewL(class CSdpAttrIdMatchList const &)
@@ -101,7 +101,7 @@
 	?NewL@CSdpServRecord@@SAPAV1@XZ @ 100 NONAME ; class CSdpServRecord * CSdpServRecord::NewL(void)
 	?NewL@CServiceSearchVisitor@@SAPAV1@ABVCSdpSearchPattern@@@Z @ 101 NONAME ; class CServiceSearchVisitor * CServiceSearchVisitor::NewL(class CSdpSearchPattern const &)
 	?NewL@CSizeAccumulator@@SAPAV1@XZ @ 102 NONAME ; class CSizeAccumulator * CSizeAccumulator::NewL(void)
-	?NewLC@CHandleItem@@SAPAV1@XZ @ 103 NONAME ; class CHandleItem * CHandleItem::NewLC(void)
+	?NewLC@CHandleItem@@SAPAV1@XZ @ 103 NONAME ABSENT ; class CHandleItem * CHandleItem::NewLC(void)
 	?NewLC@CResponseSizeVisitor@@CAPAV1@XZ @ 104 NONAME ABSENT ; class CResponseSizeVisitor * CResponseSizeVisitor::NewLC(void)
 	?NewLC@CSdpDatabase@@SAPAV1@XZ @ 105 NONAME ; class CSdpDatabase * CSdpDatabase::NewLC(void)
 	?NewLC@CServiceSearchVisitor@@SAPAV1@ABVCSdpSearchPattern@@@Z @ 106 NONAME ; class CServiceSearchVisitor * CServiceSearchVisitor::NewLC(class CSdpSearchPattern const &)

--- a/bluetooth/btsdp/EABI/sdpdatabaseU.DEF	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btsdp/EABI/sdpdatabaseU.DEF	Wed Oct 13 16:20:29 2010 +0300
@@ -11,9 +11,9 @@
 	_ZN10TSdpIntBufImEC2ERKm @ 10 NONAME
 	_ZN10TSdpIntBufItEC1ERKt @ 11 NONAME
 	_ZN10TSdpIntBufItEC2ERKt @ 12 NONAME
-	_ZN11CHandleItem12CHandleItemLEmP14CSdpServRecord @ 13 NONAME
-	_ZN11CHandleItem4NewLEv @ 14 NONAME
-	_ZN11CHandleItem5NewLCEv @ 15 NONAME
+	_ZN11CHandleItem12CHandleItemLEmP14CSdpServRecord @ 13 NONAME ABSENT
+	_ZN11CHandleItem4NewLEv @ 14 NONAME ABSENT
+	_ZN11CHandleItem5NewLCEv @ 15 NONAME ABSENT
 	_ZN11CRecordAttrC1Ev @ 16 NONAME
 	_ZN11CRecordAttrC2Ev @ 17 NONAME
 	_ZN11CRecordAttrD0Ev @ 18 NONAME

--- a/bluetooth/btsdp/database/responsesizevisitor.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btsdp/database/responsesizevisitor.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,30 +19,40 @@
 #include "mignorer.h"
 #include "DataEncoder.h"
 
+#include <bluetooth/logger.h>
+DEFINE_LOG_COMPONENT(LOG_COMPONENT_SDPDATABASE)
+
+DEBUG_PANIC_CATEGORY("sdprspvis")
+
 
 // Class CHandleItem
-EXPORT_C CHandleItem* CHandleItem::NewLC()
+
+CHandleItem* CHandleItem::NewLC(TSdpServRecordHandle aHandleID, CSdpServRecord* aRecord)
 	{
-	CHandleItem* self = new(ELeave)CHandleItem();
+	LOG_STATIC_FUNC
+	CHandleItem* self = new(ELeave) CHandleItem(aHandleID, aRecord);
 	CleanupStack::PushL(self);
 	self->ConstructL();
 	return self;
 	}
 
-EXPORT_C CHandleItem* CHandleItem::NewL()
+CHandleItem::CHandleItem(TSdpServRecordHandle aHandleID, CSdpServRecord* aRecord)
+	: CBase()
+	, iHandleID(aHandleID)
+	, iRecord(aRecord)
 	{
-	CHandleItem* self = CHandleItem::NewLC();
-	CleanupStack::Pop();
-	return self;
+	LOG_FUNC
 	}
 
 void CHandleItem::ConstructL()
 	{
-	iAttrSizeList = new (ELeave) CArrayPtrFlat<CAttrSizeItem>(KSDPAttListGran);
+	LOG_FUNC
+	iAttrSizeList = new (ELeave) CArrayPtrFlat<TAttrSizeItem>(KSDPAttListGran);
 	}
 
 CHandleItem::~CHandleItem()
 	{
+	LOG_FUNC
 	if (iAttrSizeList)
 		{
 		iAttrSizeList->ResetAndDestroy();
@@ -50,16 +60,7 @@
 		}
 	}
 
-EXPORT_C CHandleItem* CHandleItem::CHandleItemL(TSdpServRecordHandle aHandleID, CSdpServRecord* aRecord)
-	{
-	CHandleItem* self = NewL();
-	self->iHandleID = aHandleID;
-	self->iRecord = aRecord;
-	self->iRecordSize = 0;
-	return self;
-	}
-
-void CHandleItem::AddAttrItemL(CAttrSizeItem* aItem)
+void CHandleItem::AddAttrItemL(TAttrSizeItem* aItem)
 	{
 	iAttrSizeList->AppendL(aItem);
 	iRecordSize += aItem->Size() + 3; // add the attrID header size;
@@ -67,8 +68,10 @@
 
 void CHandleItem::AddAttrItemL(const TSdpAttributeID aAttributeID, TUint aSize, CSdpAttr* aAttribute)
 	{
-	CAttrSizeItem* sizeItem = new (ELeave) CAttrSizeItem(aAttributeID, aSize, aAttribute);
+	TAttrSizeItem* sizeItem = new (ELeave) TAttrSizeItem(aAttributeID, aSize, aAttribute);
+	CleanupStack::PushL(sizeItem);
 	AddAttrItemL(sizeItem);
+	CleanupStack::Pop(sizeItem);
 	}
 
 
@@ -116,13 +119,12 @@
 		{
 		for (TInt j = 0; j<AttrCount(i); j++)
 			{
-			CAttrSizeItem* attr = AttributeOf(i,j);
+			TAttrSizeItem* attr = AttributeOf(i,j);
 			CSdpAttrValue& theVal = attr->Attr()->Value();
 			Mem::Crc(totalCrc, reinterpret_cast<const TAny*>(theVal.Des()[0]), attr->Size());
 			}
 		}
 	return totalCrc;
-
 	}
 
 /**
@@ -160,7 +162,7 @@
 		TInt attrCount = AttrCount(i); // for testing
 		for (TInt j = iFirstAtt; j < attrCount; j++)
 			{
-			CAttrSizeItem* attr = AttributeOf(i,j);
+			TAttrSizeItem* attr = AttributeOf(i,j);
 			recordSize += attr->Size();
 			recordSize +=3;		// the size of a attribute ID in the list
 			}
@@ -284,7 +286,7 @@
 		totalSize += desSize;
 		while (more && (iFirstAtt < topAtt))
 			{
-			CAttrSizeItem* attr = AttributeOf(iFirstRec, iFirstAtt);
+			TAttrSizeItem* attr = AttributeOf(iFirstRec, iFirstAtt);
 			TUint nextSize = attr->Size();
 			nextSize += 3;	// Attribute ID and its header
 			if (totalSize + nextSize > aOffset)
@@ -309,7 +311,6 @@
 	aAtt = iFirstAtt;
 	aPartSent = aOffset - totalSize;
 	return ETrue;
-//	__ASSERT_DEBUG(totalSize != aOffset, DbPanic(ESdpDbBadSearchPattern));
 	}
 
 EXPORT_C TInt CSizeAccumulator::HandleCount()
@@ -330,77 +331,69 @@
 
 EXPORT_C TInt CSizeAccumulator::AttrCount(TInt aOffset)
 	{
-	if (iHandleList->Count() == 0) return 0;
+	if (iHandleList->Count() == 0)
+		{
+		return 0;
+		}
 	__ASSERT_DEBUG(aOffset <= iHandleList->Count(), DbPanic(ESdpDbBadSearchPattern));
-	if (iHandleList->At(aOffset) == NULL) return 0;
-	return iHandleList->At(aOffset)->CHandleItem::iAttrSizeList->Count();
-	}
-
-EXPORT_C CAttrSizeItem* CSizeAccumulator::AttributeOf(TInt aHandleOffset, TInt aAttOffset)
-	{
-	if (iHandleList->Count() == 0) return (CAttrSizeItem*)0;
-	__ASSERT_DEBUG(aHandleOffset < iHandleList->Count(), DbPanic(ESdpDbBadSearchPattern));
-	CHandleItem* hnd = iHandleList->At(aHandleOffset);
-	if (hnd->iAttrSizeList->Count() == 0) return (CAttrSizeItem*)0;
-	__ASSERT_DEBUG(aAttOffset < hnd->iAttrSizeList->Count(), DbPanic(ESdpDbBadSearchPattern));
-//	return iHandleList->At(aHandleOffset)->CHandleItem::iAttrSizeList->At(aAttOffset);
-	return hnd->iAttrSizeList->At(aAttOffset);
+	
+	if (!iHandleList->At(aOffset))
+		{
+		return 0;
+		}
+	
+	return iHandleList->At(aOffset)->iAttrSizeList->Count();
 	}
 
-
-
-// need this because CResponseSizeVisitor already has start list method...
-class CSizeEncVisitorAdaptor : public MIgnorer
+EXPORT_C TAttrSizeItem* CSizeAccumulator::AttributeOf(TInt aHandleOffset, TInt aAttOffset)
 	{
-public:
-	CSizeEncVisitorAdaptor(CResponseSizeVisitor& aVisitor)
-		:iVisitor(aVisitor)
-		{}
-	MSdpElementBuilder* BuildUUIDL(const TUUID& aUUID)
+	if (iHandleList->Count() == 0)
 		{
-		iVisitor.FoundUUIDL(aUUID);
-		return this;
+		return NULL;
 		}
-private:
-	CResponseSizeVisitor& iVisitor;
-	};
-
-
+	__ASSERT_DEBUG(aHandleOffset < iHandleList->Count(), DbPanic(ESdpDbBadSearchPattern));
+	
+	CHandleItem* hnd = iHandleList->At(aHandleOffset);
+	
+	if (hnd->iAttrSizeList->Count() == 0)
+		{
+		return NULL;
+		}
+	__ASSERT_DEBUG(aAttOffset < hnd->iAttrSizeList->Count(), DbPanic(ESdpDbBadSearchPattern));
+	
+	return hnd->iAttrSizeList->At(aAttOffset);
+	}
 
 
 // Class CResponseSizeVisitor 
 
 CResponseSizeVisitor::CResponseSizeVisitor()
+	: CBase()
+	, iAdapter(*this)
 	{
+	LOG_FUNC
 	}
 
 CResponseSizeVisitor::~CResponseSizeVisitor()
 	{
+	LOG_FUNC
 	delete iFoundIndex;
-	delete iCurrentRec;
-	delete iAdapter;
 	delete iParser;
 	}
 
 CResponseSizeVisitor* CResponseSizeVisitor::NewLC()
 	{
-	CResponseSizeVisitor* self = new(ELeave)CResponseSizeVisitor();
+	LOG_STATIC_FUNC
+	CResponseSizeVisitor* self = new(ELeave) CResponseSizeVisitor();
 	CleanupStack::PushL(self);
 	self->ConstructL();
 	return self;
 	}
 
-CResponseSizeVisitor* CResponseSizeVisitor::NewL()
-	{
-	CResponseSizeVisitor* self = CResponseSizeVisitor::NewLC();
-	CleanupStack::Pop();
-	return self;
-	}
-
 void CResponseSizeVisitor::ConstructL()
 	{
-	iAdapter = new(ELeave) CSizeEncVisitorAdaptor(*this);
-	iParser = CElementParser::NewL(iAdapter);
+	LOG_FUNC
+	iParser = CElementParser::NewL(&iAdapter);
 	}
 
 // Iterate thru attributes in record
@@ -412,121 +405,138 @@
 */
 void CResponseSizeVisitor::SearchRecordL(CSdpServRecord& aRec)
 	{
-// could be in calling routine
+	LOG_FUNC
+	// could be in calling routine
 	if (iSearchPattern)
-	{
-		if (iFoundIndex)
-			{
-			delete iFoundIndex;
-			iFoundIndex = 0;
-			}
+		{
+		delete iFoundIndex;
+		iFoundIndex = NULL;
 		iFoundIndex = CBitMapAllocator::NewL(iSearchSize);
 		iUseThis = EFalse;
-	}
+		}
 	else
+		{
 		iUseThis = ETrue;
-//	if (iCurrentRec) delete iCurrentRec;	// I want a reset.
-	iCurrentRec = CHandleItem::CHandleItemL(aRec.Handle(), &aRec);
+		}
+		
+	CHandleItem* currentRec = CHandleItem::NewLC(aRec.Handle(), &aRec);
 	
 	for(TServAttrIter attrIter(aRec.AttributeIter()); attrIter; attrIter++)
 		{
-/* 
-	we are checking every attribute, searching for the UUIDs. We don't exit if
-	we find them all because we also want to get the sizes of any attributes which
-	match our list if we have one.
-	The array of sizes is built, then thrown away if it doesn't match.
- 
-*/
+		// we are checking every attribute, searching for the UUIDs. We don't exit if
+		// we find them all because we also want to get the sizes of any attributes which
+		// match our list if we have one.
+		// The array of sizes is built, then thrown away if it doesn't match.
+		
+		CSdpAttr* attr = attrIter;
+		
 		if (iAtMatList)
 			{
-			TSdpAttributeID theAttrID = (*attrIter).AttributeID();
+			TSdpAttributeID theAttrID = attr->AttributeID();
 			if(iAtMatList->InMatchList(theAttrID))
 				{// create a new array entry
-				TUint size = (*attrIter).Value().DataSize();
-				TSdpElementType type = (*attrIter).Value().Type();
+				TUint size = attr->Value().DataSize();
+				TSdpElementType type = attr->Value().Type();
 				if (type != ETypeEncoded) 
 					{
-// some server records may be un-encoded
+					// some server records may be un-encoded
 					size += TElementEncoder::HeaderSize(type, size); // add the header size
 					}
-				if(!(type==ETypeNil)&&!(type==ETypeEncoded&&size<=1))
-				{ // only include attribute if not either null or encoded null ...
-				  // (size of encoded (which INCLUDES header) in all non-null cases is > 1
-				  //  because other attribute types either have
-				  //  to have a header plus at least one byte, or they have at least a two byte header.)
-					iCurrentRec->AddAttrItemL(theAttrID, size, attrIter);
+				if(type != ETypeNil && !(type == ETypeEncoded && size <= 1))
+					{
+					// only include attribute if not either null or encoded null ...
+					// (size of encoded (which INCLUDES header) in all non-null cases is > 1
+					//  because other attribute types either have
+					//  to have a header plus at least one byte, or they have at least a two byte header.)
+					currentRec->AddAttrItemL(theAttrID, size, attr);
 					}
 				}
 			}
 		// check if any UUIDs match only if we have a UUIDList.
-		if (iSearchPattern) (*attrIter).AcceptVisitorL(*this);
+		if (iSearchPattern)
+			{
+			attr->AcceptVisitorL(*this);
+			}
 		}
+	
 	if (iUseThis)
 		{
 		// now we have to copy the array(s) we've built up.
-		iCollector->AddHandleL(iCurrentRec);
-		iCurrentRec = 0;
+		iCollector->AddHandleL(currentRec);
+		CleanupStack::Pop(currentRec);
 		}
 	else
 		{
-		delete iCurrentRec;	// I don't want a heap fault.
-		iCurrentRec = 0;
+		CleanupStack::PopAndDestroy(currentRec);
 		}
 	}
 
 
-//	static void SizeRespSSL(CSdpDatabase& aDb, const CSdpSearchPattern &aPattern, const CSizeAccumulator& aCollector);
-//	static void SizeRespARL(CSdpServRecord& aRec, CSdpAttrIdMatchList &aList, const CSizeAccumulator& aCollector);
-//	static void SizeRespSAL(CSdpDatabase &aDb, const CSdpSearchPattern &aPattern, CSdpAttrIdMatchList &aList, const CSizeAccumulator& aCollector);
-// we need three of these calls, all slightly different
-	EXPORT_C void CResponseSizeVisitor::SizeRespSSL(CSdpDatabase& aDb, const CSdpSearchPattern& aPattern, CSizeAccumulator& aCollector)
-   	{
-	if (aPattern.Count() == 0) User::Leave(KErrArgument); // this is part of spec.
-//	SDP_DEBUG(3, FPrint(_L("Sizing SDP DB for pattern with %d entries\n"), aPattern.Count()));
+EXPORT_C void CResponseSizeVisitor::SizeRespSSL(CSdpDatabase& aDb, const CSdpSearchPattern& aPattern, CSizeAccumulator& aCollector)
+	{
+	LOG_STATIC_FUNC
+	if (aPattern.Count() == 0)
+		{
+		User::Leave(KErrArgument); // this is part of spec.
+		}
+	
+	LOG1(_L8("Sizing SDP DB for pattern with %d entries"), aPattern.Count());
 	CResponseSizeVisitor* theVisitor = CResponseSizeVisitor::NewLC();
+	
 	theVisitor->iCollector = &aCollector;
-	theVisitor->iAtMatList = NULL;		// using it as a flag...
+	theVisitor->iAtMatList = NULL; // using it as a flag...
 	theVisitor->iSearchPattern = &aPattern;
 	theVisitor->iSearchSize = theVisitor->iSearchPattern->Count();
-
+	
 	for(TServRecordIter recIter(aDb.RecordIter()); recIter; recIter++)
 		{// Iterate thru records in Db
 		theVisitor->SearchRecordL(*recIter);
 		}
-	CleanupStack::PopAndDestroy();//theVisitor
+	
+	CleanupStack::PopAndDestroy(theVisitor);
 	}
 
-	EXPORT_C void CResponseSizeVisitor::SizeRespARL(CSdpServRecord& aRec, const CSdpAttrIdMatchList& aList, CSizeAccumulator& aCollector)
+EXPORT_C void CResponseSizeVisitor::SizeRespARL(CSdpServRecord& aRec, const CSdpAttrIdMatchList& aList, CSizeAccumulator& aCollector)
 	{
-//	SDP_DEBUG(3, FPrint(_L("Sizing SDP DB for single record\n")));
+	LOG_STATIC_FUNC
+	
+	LOG(_L8("Sizing SDP DB for single record"));
 	CResponseSizeVisitor* theVisitor = CResponseSizeVisitor::NewLC();
+	
 	theVisitor->iCollector = &aCollector;
-	theVisitor->iAtMatList = &aList;		// using it as a flag...
+	theVisitor->iAtMatList = &aList; // using it as a flag...
 	theVisitor->iSearchPattern = NULL;
 	theVisitor->iSearchSize = 0;
+	
 	theVisitor->SearchRecordL(aRec);
-	CleanupStack::PopAndDestroy();//theVisitor
+	
+	CleanupStack::PopAndDestroy(theVisitor);
 	}
 
-	EXPORT_C void CResponseSizeVisitor::SizeRespSAL(CSdpDatabase &aDb, const CSdpSearchPattern &aPattern, const CSdpAttrIdMatchList& aList, CSizeAccumulator& aCollector)
+EXPORT_C void CResponseSizeVisitor::SizeRespSAL(CSdpDatabase &aDb, const CSdpSearchPattern &aPattern, const CSdpAttrIdMatchList& aList, CSizeAccumulator& aCollector)
 	{
-	if (aPattern.Count() == 0) User::Leave(KErrArgument); // this is part of spec.
-//	SDP_DEBUG(3, FPrint(_L("Sizing SDP DB (and attribs) with %d UUIDs\n"), aPattern.Count()));
+	LOG_STATIC_FUNC
+	if (aPattern.Count() == 0)
+		{
+		User::Leave(KErrArgument); // this is part of spec.
+		}
+	
+	LOG1(_L8("Sizing SDP DB (and attribs) with %d UUIDs"), aPattern.Count());
 	CResponseSizeVisitor* theVisitor = CResponseSizeVisitor::NewLC();
+	
 	theVisitor->iCollector = &aCollector;
-	theVisitor->iAtMatList = &aList;		// using it as a flag...
+	theVisitor->iAtMatList = &aList; // using it as a flag...
 	theVisitor->iSearchPattern = &aPattern;
 	theVisitor->iSearchSize = theVisitor->iSearchPattern->Count();
-
+	
 	for(TServRecordIter recIter(aDb.RecordIter()); recIter; recIter++)
 		{// Iterate thru records in Db
 		theVisitor->SearchRecordL(*recIter);
 		}
-	CleanupStack::PopAndDestroy();//theVisitor
+	
+	CleanupStack::PopAndDestroy(theVisitor);
 	}
 
-
-
 void CResponseSizeVisitor::VisitAttributeL(CSdpAttr& /*aAttribute*/)
 	{
 	}
@@ -538,13 +548,15 @@
 	case ETypeUUID:
 		FoundUUIDL(aValue.UUID());
 		break;
-		case ETypeEncoded:
-// parse out any UUIDs in this encoded attribute
+		
+	case ETypeEncoded:
+		// parse out any UUIDs in this encoded attribute
 		iParser->Reset();
 		/*rem = */iParser->ParseElementsL(aValue.Des());
 		break;
+		
 	default:
-		return;
+		break;
 		}
 	}
 
@@ -558,6 +570,8 @@
 
 void CResponseSizeVisitor::FoundUUIDL(const TUUID& aUUID)
 	{
+	ASSERT_DEBUG(iSearchPattern);
+	ASSERT_DEBUG(iFoundIndex);
 	TInt pos;
 	if (iSearchPattern->Find(aUUID, pos)==0 &&
 		iFoundIndex->IsFree(pos))
@@ -569,3 +583,14 @@
 			}
 		}
 	}
+
+
+TSizeEncVisitorAdaptor::TSizeEncVisitorAdaptor(CResponseSizeVisitor& aVisitor)
+	:iVisitor(aVisitor)
+	{}
+
+MSdpElementBuilder* TSizeEncVisitorAdaptor::BuildUUIDL(const TUUID& aUUID)
+	{
+	iVisitor.FoundUUIDL(aUUID);
+	return this;
+	}

--- a/bluetooth/btsdp/database/responsesizevisitor.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btsdp/database/responsesizevisitor.h	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -35,34 +35,30 @@
 class CSdpAttr;
 
 /** 
-	CAttrSizeItem
+	TAttrSizeItem
 	contains the attribute ID, the size of the attribute and a pointer to the attribute
 	This object is attached to a list (CArrayPtrFlat) contained in CHandleItem object
 **/
-NONSHARABLE_CLASS(CAttrSizeItem) // not a cbase because no benefit, just overhead
-{
+NONSHARABLE_CLASS(TAttrSizeItem)
+	{
 friend class CSizeAccumulator;
 public:
-	CAttrSizeItem(){};
-	~CAttrSizeItem(){iAttribute=0;};
-	CAttrSizeItem(const TSdpAttributeID aAttributeID, TUint aSize, CSdpAttr* aAttribute):
+	TAttrSizeItem(){};
+	TAttrSizeItem(const TSdpAttributeID aAttributeID, TUint aSize, CSdpAttr* aAttribute):
 		iAttributeID(aAttributeID),
 		iSize(aSize),
 		iAttribute(aAttribute) {};
-	inline TSdpAttributeID AttID();
-	inline TUint Size();
-	inline CSdpAttr* Attr();
+	inline TSdpAttributeID AttID() {return iAttributeID;}
+	inline TUint Size() {return iSize;}
+	inline CSdpAttr* Attr() {return iAttribute;}
 
 private:
 	TSdpAttributeID iAttributeID;
 	TUint iSize;
 	CSdpAttr* iAttribute;
-};
-inline TSdpAttributeID CAttrSizeItem::AttID() {return iAttributeID;};
-inline TUint CAttrSizeItem::Size() {return iSize;};
-inline CSdpAttr* CAttrSizeItem::Attr() {return iAttribute;};
+	};
 
-// const TUint KSDPAttListGran = 8*(sizeof(CAttrSizeItem*)); granularity for a Seg
+// const TUint KSDPAttListGran = 8*(sizeof(TAttrSizeItem*)); granularity for a Seg
 const TUint KSDPAttListGran = 8; // granularity for a flat
 
 /**
@@ -71,28 +67,25 @@
 	for that record which match the Attribute ID match list
 **/
 NONSHARABLE_CLASS(CHandleItem) : public CBase
-{
+	{
 friend class CSizeAccumulator;
 public:
 	CHandleItem(){};
+	static CHandleItem* NewLC(TSdpServRecordHandle aHandleID, CSdpServRecord* aRecord);
 	~CHandleItem();
-	IMPORT_C static CHandleItem* NewL();
-	IMPORT_C static CHandleItem* NewLC();
-	IMPORT_C static CHandleItem* CHandleItemL(TSdpServRecordHandle aHandleID, CSdpServRecord* aRecord);
-
-//	PutRecord(TSdpServRecordHandle aHandleID, const CSdpServRecord* aRecord); // update the NULL data
-
-	void AddAttrItemL(CAttrSizeItem* aItem);
+	
+	void AddAttrItemL(TAttrSizeItem* aItem);
 	void AddAttrItemL(const TSdpAttributeID aAttributeID, TUint aSize, CSdpAttr* aAttribute);
-	inline TInt Count();
+	inline TInt Count() {return iAttrSizeList->Count();}
+	
 private:
+	CHandleItem(TSdpServRecordHandle aHandleID, CSdpServRecord* aRecord);
 	void ConstructL();
 	TSdpServRecordHandle iHandleID;
 	CSdpServRecord* iRecord;
 	TUint iRecordSize;
-	CArrayPtrFlat<CAttrSizeItem>* iAttrSizeList; // stores the attributes found
-};
-inline TInt CHandleItem::Count() {return iAttrSizeList->Count();};
+	CArrayPtrFlat<TAttrSizeItem>* iAttrSizeList; // stores the attributes found
+	};
 
 // const TUint KSDPHandListGran = 8*(sizeof(CHandleItem*)); granularity for a Seg
 const TUint KSDPHandListGran = 8; // granularity for a flat
@@ -105,8 +98,6 @@
 	IMPORT_C static CSizeAccumulator* NewL();
 	IMPORT_C static CSizeAccumulator* NewLC();
 	void AddHandleL(CHandleItem* aHandleItem); // create a new array element
-//	void AddHandle(TSdpServRecordHandle aHandleID, CSdpServRecord* aRecord); // create a new array element
-//	void AddAttrib(TSdpAttributeID aAttributeID, CSdpAttr* aAttribute, TUint aSize);
 
 // these methods are used in building the server response once the search has been carried out
 	IMPORT_C TUint SizeLeft(); // can be called before or after setting the start point
@@ -116,7 +107,7 @@
 	IMPORT_C TSdpServRecordHandle HandleAt(TInt aOffset); // returns the Record handle at offset i
 	IMPORT_C TUint HandleSize(TInt aOffset);  // returns the size of the record at offset aOffset
 	IMPORT_C TInt AttrCount(TInt aOffset);	// returns the count of attributes for record at offset i
-	IMPORT_C CAttrSizeItem* AttributeOf(TInt aHandleOffset, TInt aAttOffset); // returns the attribute size object (CAttrSizeItem) at i,j
+	IMPORT_C TAttrSizeItem* AttributeOf(TInt aHandleOffset, TInt aAttOffset); // returns the attribute size object (TAttrSizeItem) at i,j
 
 private:
 	CSizeAccumulator():iFirstRec(0),iFirstAtt(0){};
@@ -137,40 +128,50 @@
 	b carries out the same selection of attributes as CAttrExtractVisitor::EncodeAttributesL
 
 **/
-class CSizeEncVisitorAdaptor;
+class CResponseSizeVisitor;
+
+// need this because CResponseSizeVisitor already has start list method...
+NONSHARABLE_CLASS(TSizeEncVisitorAdaptor) : public MIgnorer
+	{
+public:
+	TSizeEncVisitorAdaptor(CResponseSizeVisitor& aVisitor);
+	MSdpElementBuilder* BuildUUIDL(const TUUID& aUUID);
+	
+private:
+	CResponseSizeVisitor& iVisitor;
+	};
 
 NONSHARABLE_CLASS(CResponseSizeVisitor) : public CBase, public MAttributeVisitor
 	{
+friend class TSizeEncVisitorAdaptor;
 public:
-    ~CResponseSizeVisitor();
-
+	~CResponseSizeVisitor();
+	
 	IMPORT_C static void SizeRespSSL(CSdpDatabase& aDb, const CSdpSearchPattern& aPattern, CSizeAccumulator& aCollector);
 	IMPORT_C static void SizeRespARL(CSdpServRecord& aRec, const CSdpAttrIdMatchList& aList, CSizeAccumulator& aCollector);
 	IMPORT_C static void SizeRespSAL(CSdpDatabase& aDb, const CSdpSearchPattern& aPattern, const CSdpAttrIdMatchList& aList, CSizeAccumulator& aCollector);
-
-	void FoundUUIDL(const TUUID& aUUID); // needs to be public because of the encoder visitor adaptor
-
+	
 private:
-	static CResponseSizeVisitor* NewL();
 	static CResponseSizeVisitor* NewLC();
-    CResponseSizeVisitor();
+	CResponseSizeVisitor();
 	void ConstructL();
-
+	
 	void SearchRecordL(CSdpServRecord& aRec);
-
+	
+	void FoundUUIDL(const TUUID& aUUID);
+	
 	// MAttributeVisitor interface
-    void VisitAttributeL(CSdpAttr &aAttribute);
-    void VisitAttributeValueL(CSdpAttrValue &aValue, TSdpElementType aType);
-    void StartListL(CSdpAttrValueList &aList);
-    void EndListL();
-
+	void VisitAttributeL(CSdpAttr &aAttribute);
+	void VisitAttributeValueL(CSdpAttrValue &aValue, TSdpElementType aType);
+	void StartListL(CSdpAttrValueList &aList);
+	void EndListL();
+	
 private:
-	CSizeEncVisitorAdaptor* iAdapter;
+	TSizeEncVisitorAdaptor iAdapter;
 	CElementParser* iParser;				// used by the encoded UUID parser
 	const CSdpSearchPattern* iSearchPattern;	// a local pointer to the UUID search list
 	CSizeAccumulator* iCollector;			// a local pointer to the size collector object supplied
 	const CSdpAttrIdMatchList* iAtMatList;		// a local pointer to the attribute match list or NULL
-	CHandleItem* iCurrentRec;				// we build the handle and attribute list and perhaps throw it away
 	CBitMapAllocator* iFoundIndex;			// a simpler match
 	TInt iSearchSize;						// how many items in search pattern
 	TBool	iUseThis;						// do we use this record ?

--- a/bluetooth/btsdp/database/rsdpdatabase.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btsdp/database/rsdpdatabase.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -149,7 +149,13 @@
 This should be used by clients to do resource leakage debugging checks. */
 	{
 	LOG_FUNC
-	SendReceive(ESdpResourceCountMarkStart, TIpcArgs(NULL)); //ss//
+	IF_FLOGGING(TInt err = ) SendReceive(ESdpResourceCountMarkStart, TIpcArgs(NULL)); //ss//
+	IF_FLOGGING(
+		if (err != KErrNone)
+			{
+			LOG1(_L("ALERT: Resource count mark start completed with %d"), err);
+			}
+		);
 	}
 
 EXPORT_C void RSdp::ResourceCountMarkEnd()
@@ -158,7 +164,13 @@
 This should be used by clients to do resource leakage debugging checks. */
 	{
 	LOG_FUNC
-	SendReceive(ESdpResourceCountMarkEnd, TIpcArgs(NULL)); //ss//
+	IF_FLOGGING(TInt err = ) SendReceive(ESdpResourceCountMarkEnd, TIpcArgs(NULL)); //ss//
+	IF_FLOGGING(
+		if (err != KErrNone)
+			{
+			LOG1(_L("ALERT: Resource count mark end completed with %d"), err);
+			}
+		);
 	}
 
 EXPORT_C TInt RSdp::ResourceCount()
@@ -171,7 +183,13 @@
 	LOG_FUNC
 	TInt count = 0;
 	TPckgBuf<TInt> pckg(count);
-	SendReceive(ESdpResourceCount, TIpcArgs(&pckg)); //ss//
+	IF_FLOGGING(TInt err = ) SendReceive(ESdpResourceCount, TIpcArgs(&pckg)); //ss//
+	IF_FLOGGING(
+		if (err != KErrNone)
+			{
+			LOG1(_L("ALERT: Resource count completed with %d"), err);
+			}
+		);
 	return pckg();
 	}
 
@@ -449,7 +467,8 @@
 	if (SubSessionHandle())
 		{
 		 //The '5' below is max ratio of number of UTF_8 chars to number of unicode chars .
-		HBufC8* buf = HBufC8::NewLC(5*aDesCValue.Length());
+		TInt size = 5*aDesCValue.Length(); 
+		HBufC8* buf = HBufC8::NewLC(size);
 		TPtr8 ptr = buf->Des();
 		CnvUtfConverter::ConvertFromUnicodeToUtf8(ptr, aDesCValue);
 		UpdateAttributeL(aHandle, aAttrID, ptr);
@@ -545,7 +564,13 @@
 		TPckg<TSdpAttributeID> idPckg(aAttrID);
 		TPckg<TSdpServRecordHandle> handlePckg(aHandle);
 
-		SendReceive(ESdpDatabaseDeleteAttribute, TIpcArgs(&handlePckg, &idPckg));
+		IF_FLOGGING(TInt err = ) SendReceive(ESdpDatabaseDeleteAttribute, TIpcArgs(&handlePckg, &idPckg));
+		IF_FLOGGING(
+			if (err != KErrNone)
+				{
+				LOG1(_L("ALERT: Delete attribute completed with %d"), err);
+				}
+			);
 		}
 	else
 		{
@@ -589,7 +614,13 @@
 		{
 		TPckg<TSdpServRecordHandle> handlePckg(aHandle);
 
-		SendReceive(ESdpDatabaseDeleteServiceRecord, TIpcArgs(&handlePckg));
+		IF_FLOGGING(TInt err = ) SendReceive(ESdpDatabaseDeleteServiceRecord, TIpcArgs(&handlePckg));
+		IF_FLOGGING(
+			if (err != KErrNone)
+				{
+				LOG1(_L("ALERT: Delete service record completed with %d"), err);
+				}
+			);
 		}
 	else
 		{

--- a/bluetooth/btsdp/server/protocol/reqhandler.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btsdp/server/protocol/reqhandler.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -49,11 +49,7 @@
 		}
 	}
 
-#ifdef __FLOGGING__
-TInt SdpReqHandler::RunError(TInt aError, const TSdpPdu& aReqPdu, TSdpPdu &aRespPdu)
-#else
 TInt SdpReqHandler::RunError(TInt aError, const TSdpPdu& /*aReqPdu*/, TSdpPdu &aRespPdu)
-#endif
 /**
 	Send an appropriate error.
 
@@ -371,7 +367,7 @@
 	TInt oldLen = responseAttributes.Length();
 	responseAttributes.SetLength(oldLen + KRspAttributeCountSize);
 	BigEndian::Put16(&responseAttributes[KRspAttributeCountOffset], (TUint16)(pduSize));
-	CAttrSizeItem* currentAttItem = collector->AttributeOf(sentRecords, sentAttributes);
+	TAttrSizeItem* currentAttItem = collector->AttributeOf(sentRecords, sentAttributes);
 	TInt lastAttr = collector->AttrCount(sentRecords);
 	TPtrC8 attrValPtr(0,0);
 	TBuf8<1> wBuffer(1); // used for byte insertion
@@ -615,7 +611,7 @@
 	TInt oldLen = responseAttributes.Length();
 	responseAttributes.SetLength(oldLen + KRspAttributeCountSize);
 	BigEndian::Put16(&responseAttributes[KRspAttributeCountOffset], (TUint16)(pduSize));
-	CAttrSizeItem* currentAttItem = collector->AttributeOf(sentRecords, sentAttributes);
+	TAttrSizeItem* currentAttItem = collector->AttributeOf(sentRecords, sentAttributes);
 	TInt lastAttr = collector->AttrCount(sentRecords);
 	TPtrC8 attrValPtr(0,0);
 	TBuf8<1> wBuffer(1); // used for byte insertion

--- a/bluetooth/btstack/avctp/avctp.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avctp/avctp.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -388,6 +388,7 @@
 	localAddr.SetSecurity(sec);
 	
 	CleanupStack::Pop(sap);
+	__ASSERT_DEBUG(!iListener, Panic(EObjectAlreadyExists));
 	iListener = CIncomingConnectionListener::NewL(*this, sap, localAddr, KProtocolListeningQueueSize);										
 	
 	CServProviderBase* sap2 =iLowerProtocol->NewSAPL(KSockSeqPacket);

--- a/bluetooth/btstack/avctp/avctpmuxer.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avctp/avctpmuxer.h	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -39,7 +39,7 @@
 
 typedef THashMapIter<TInt, const TClientItem*> TClientItemIter;
 
-class TAvctpSecondChannelPseudoSocket : public MSocketNotify
+NONSHARABLE_CLASS(TAvctpSecondChannelPseudoSocket) : public MSocketNotify
 	{
 public:
 	TAvctpSecondChannelPseudoSocket(MSecondChannelPseudoSocketNotify& aNotify);

--- a/bluetooth/btstack/avctp/avctpmuxerstates.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avctp/avctpmuxerstates.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -410,6 +410,7 @@
 	if (aAddr != TBTDevAddr(0))
 		{
 		// New this up just in time.
+		__ASSERT_DEBUG(!aTransport.iChannelSAPs[KAvctpPrimaryChannel], Panic(EObjectAlreadyExists));
 		TRAP(ret, aTransport.iChannelSAPs[KAvctpPrimaryChannel] = aTransport.iProtocol.LowerProtocol()->NewSAPL(KSockSeqPacket));
 		if (ret == KErrNone)
 			{

--- a/bluetooth/btstack/avctp/avctpsap.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avctp/avctpsap.h	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -191,7 +191,7 @@
 
 // the SAPs are "sockets" so that the avctp transport can be very thin and "transient" so effectively forwards calls from L2CAP
 // perhaps with a bit of roundrobinning in the CanSend
-class CAvctpControlSAP : public CBluetoothSAP, public MSocketNotify
+NONSHARABLE_CLASS(CAvctpControlSAP) : public CBluetoothSAP, public MSocketNotify
 	{
 public:
 	static CAvctpControlSAP* NewL(CAvctpProtocol& aProtocol);

--- a/bluetooth/btstack/avctp/avctputils.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avctp/avctputils.h	Wed Oct 13 16:20:29 2010 +0300
@@ -165,6 +165,7 @@
 	EAvctpInvalidChannelIoctl = 66,
 	EAvctpSapClosed = 67,
 	ENullAvctpProtocol = 68,
+	EObjectAlreadyExists = 69,
 	};
 
 /**

--- a/bluetooth/btstack/avdtp/avdtpConfigurators.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpConfigurators.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -39,7 +39,10 @@
 	}
 
 
-
+CSEPConfigurator::~CSEPConfigurator()
+	{
+	LOG_FUNC
+	}
 
 CRemoteSEPConfigurator* CRemoteSEPConfigurator::NewL(CSignallingSession& aSignallingSession,
 													 CAvdtpProtocol& aProtocol,

--- a/bluetooth/btstack/avdtp/avdtpConfigurators.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpConfigurators.h	Wed Oct 13 16:20:29 2010 +0300
@@ -33,6 +33,8 @@
 public:
 	virtual TInt AddCapability(const TDesC8& aOption) =0;
 	virtual TInt Finalise() =0;
+	~CSEPConfigurator();
+
 protected:
 	CSEPConfigurator(CSignallingSession& aSignallingSession, CAvdtpProtocol& aProtocol);
 	inline CSignallingSession& SignallingSession() const 

--- a/bluetooth/btstack/avdtp/avdtpDirectChannel.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpDirectChannel.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -45,6 +45,11 @@
 	LOG_FUNC
 	}
 		
+CDirectChannel::~CDirectChannel()
+	{
+	LOG_FUNC
+	}
+
 TInt CDirectChannel::AttachTransportSession(CUserPlaneTransportSession& aSession, TAvdtpTransportSessionType /*aType*/, TL2CapConfig::TChannelPriority aPriority)
 	{
 	LOG_FUNC

--- a/bluetooth/btstack/avdtp/avdtpDirectChannel.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpDirectChannel.h	Wed Oct 13 16:20:29 2010 +0300
@@ -33,6 +33,8 @@
 public:
 	static CDirectChannel* NewL(CAvdtpProtocol& aProtocol,
 								const TBTDevAddr& aRemoteDevice);
+	~CDirectChannel();
+
 	//from base
 // can just forward down to L2CAP...
 

--- a/bluetooth/btstack/avdtp/avdtpLogicalChannelFactory.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpLogicalChannelFactory.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -672,6 +672,11 @@
 	{
 	LOG_FUNC
 	__ASSERT_DEBUG(iCurrentActiveJob && iCurrentActiveJob->iNumChannelsRequired, Panic(EAvdtpLogicalChannelFactoryJobHasNoLogicalChannels));
+	if(!(iCurrentActiveJob && iCurrentActiveJob->iNumChannelsRequired))
+	    {
+	    FLOG(_L("CLogicalChannelFactory::DoObtainChannelL called when current job was either non existant or not requiring channels."));
+	    User::Leave(KErrNotReady);
+	    }
 	
 	static const TInt KAVDTPPSM = 0x19;	
 	
@@ -720,6 +725,7 @@
 	// The call to ActiveOpen could affect iCurrentActiveJob if 
 	// L2CAP synchrononously errors -- in which case iCurrentActiveJob could now
 	// have become NULL. Make sure it is still valid.
+    // coverity[check_after_deref]
 	if (iCurrentActiveJob)
 		{		
 		// decrement how many more channels required for this job

--- a/bluetooth/btstack/avdtp/avdtpMediaSession.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpMediaSession.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -59,6 +59,11 @@
 	iPacketsLost = 0;
 	}
 	
+CMediaSession::~CMediaSession()
+	{
+	LOG_FUNC
+	}
+
 void CMediaSession::ConstructL()
 	{
 	LOG_FUNC

--- a/bluetooth/btstack/avdtp/avdtpMediaSession.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpMediaSession.h	Wed Oct 13 16:20:29 2010 +0300
@@ -34,6 +34,7 @@
 public:
 	static CMediaSession* NewLC(CAvdtpProtocol& aProtocol, CAvdtpSAP& aSAP, CAVStream& aStream);
 	static CMediaSession* NewL(CAvdtpProtocol& aProtocol, CAvdtpSAP& aSAP, CAVStream& aStream);
+	~CMediaSession();
 
 	virtual TInt GetOption(TUint aLevel, TUint aName, TDes8& aOption) const;
 	virtual void Ioctl(TUint aLevel, TUint aName,  const TDesC8* aOption);

--- a/bluetooth/btstack/avdtp/avdtpMuxChannel.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpMuxChannel.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -163,7 +163,7 @@
 void CMuxChannel::ConstructL(TTCID aRemotelyAssignedTCID)
 	{
 	LOG_FUNC
-//	iHeartbeat = CHeartbeat::NewL()
+	
 	iMuxSendTimer = CPeriodic::NewL(EPriorityHigh);
 #ifdef HAVE_INBOUND_MUX_PACKET
 	iInboundMessage = CAvdtpInboundMuxedMessage::NewL(*this);
@@ -205,7 +205,7 @@
 CMuxChannel::~CMuxChannel()
 	{
 	LOG_FUNC
-	iMuxSendTimer->Cancel();
+	delete iMuxSendTimer;
 	iTCID.Close();
 	}
 	
@@ -435,6 +435,9 @@
 		case ERecovery:
 			array = &iRecoverySessions;
 			break;
+		default:
+			__ASSERT_DEBUG(ETrue, Panic(EAVDTPBadSessionDetachFromTransportChannel));
+			break;
 		}
 	
 #ifdef _DEBUG

--- a/bluetooth/btstack/avdtp/avdtpSignallingMessages.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpSignallingMessages.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -37,13 +37,23 @@
 	LOG_FUNC
 	Data().Init();
 	}
-	
+
+CAvdtpSignallingMessage::~CAvdtpSignallingMessage()
+	{
+	LOG_FUNC
+	}
+
 CAvdtpInboundSignallingMessage::CAvdtpInboundSignallingMessage(CSignallingChannel& aSignallingChannel)
 : iSignallingChannel(aSignallingChannel)
 	{
 	LOG_FUNC
 	}
 
+CAvdtpInboundSignallingMessage::~CAvdtpInboundSignallingMessage()
+	{
+	LOG_FUNC
+	}
+
 /*static*/ void CAvdtpOutboundSignallingMessage::PrependSignallingHeaderL(
 									RMBufChain& aDest,
 									const TAvdtpPacketType& aPacketType,

--- a/bluetooth/btstack/avdtp/avdtpSignallingMessages.h	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpSignallingMessages.h	Wed Oct 13 16:20:29 2010 +0300
@@ -202,6 +202,7 @@
 	inline TAvdtpMessage Signal() const;
 protected:
 	CAvdtpSignallingMessage();
+	~CAvdtpSignallingMessage();
 protected:
 	TAvdtpMessageType		iMessageType;
 	TAvdtpMessage			iSignal;
@@ -219,6 +220,7 @@
 	{
 public:
 	explicit CAvdtpInboundSignallingMessage(CSignallingChannel& aSignallingChannel);
+	~CAvdtpInboundSignallingMessage();
 	virtual TInt NewData(TUint aCount);
 private:	
 	static TAvdtpMessage SignalIdentifier(const RMBufChain& aMessage);