diff -r bdd9da0d70fe -r 1f1dad4af8f8 mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbcommon/src/mpxdbcommonutil.cpp --- a/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbcommon/src/mpxdbcommonutil.cpp Wed Sep 15 12:09:46 2010 +0300 +++ b/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbcommon/src/mpxdbcommonutil.cpp Wed Oct 13 14:28:40 2010 +0300 @@ -329,8 +329,7 @@ extractPos = KMCPathStartPos; // c:\..., include first '\' of the path } - HBufC* fileNameBuf = HBufC::NewLC(aName.Length()+KMCIntegerLen); - TPtr fileName(fileNameBuf->Des()); + TBuf fileName; if( extractPos ) { // append volume's unique Id to path to maintain uniqueness @@ -358,7 +357,7 @@ TInt narrowFileLen(0); TPtrC8 narrowFileName; #if defined(_UNICODE) - narrowFileLen = fileNameBuf->Des().Length() * 2; + narrowFileLen = fileName.Length() * 2; narrowFileName.Set((TUint8*)fileName.Ptr(), narrowFileLen); #else narrowFileLen = fileName.Length(); @@ -376,9 +375,6 @@ TUint32 uniqueId(0); uniqueId = aTableId << 28; uniqueId |= (ptr[3]&0x0F)<<24 | (ptr[2]<<16) | (ptr[1]<<8) | ptr[0]; - - CleanupStack::PopAndDestroy(fileNameBuf); - return uniqueId; }