diff -r 64200268cac2 -r 866b4af7ffbe mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropdesc.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropdesc.cpp Fri Sep 17 11:40:03 2010 +0800 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropdesc.cpp Tue Sep 28 20:14:08 2010 +0800 @@ -422,9 +422,11 @@ iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeFunctionalID, 1, 0, NULL); delete iData; + iData = NULL; iData = GetGUIDL( MMTPFrameworkConfig::EDeviceDefaultFuncationalID ); iPropDesc->SetL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, *iData); delete iData; + iData = NULL; iData = GetGUIDL(MMTPFrameworkConfig::EDeviceCurrentFuncationalID); iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, *iData); @@ -443,10 +445,12 @@ iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeModelID, 0, 0, NULL); delete iData; + iData = NULL; iData = GetGUIDL(MMTPFrameworkConfig::EDeviceDefaultModelID); iPropDesc->SetL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, *iData); delete iData; + iData = NULL; iData = GetGUIDL(MMTPFrameworkConfig::EDeviceCurrentModelID); iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, *iData);