From 4c895ce7b9ac983f1aaf302bc579f80d76cd4ab8 Mon Sep 17 00:00:00 2001 From: Duyoung Jang Date: Wed, 31 Jul 2013 19:10:01 +0900 Subject: [PATCH] Fix prevent Change-Id: Ib532a5c34d66ef90bd17c292b3205914ec91f22a Signed-off-by: Duyoung Jang --- inc/InstallerDefs.h | 2 +- src/Step/RdsStep.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h index b2951c3..ddb7e36 100644 --- a/inc/InstallerDefs.h +++ b/inc/InstallerDefs.h @@ -23,7 +23,7 @@ #include "InstallerUtil.h" -#define OSP_INSTALLER_VERSION "version=[20130715.2]" +#define OSP_INSTALLER_VERSION "version=[20130731.1]" #define DIR_BIN L"/bin" #define DIR_INFO L"/info" diff --git a/src/Step/RdsStep.cpp b/src/Step/RdsStep.cpp index 1c747db..4ac17c0 100755 --- a/src/Step/RdsStep.cpp +++ b/src/Step/RdsStep.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include "InstallationContext.h" @@ -109,10 +110,10 @@ RdsStep::OnRdsProcessing(void) res = InstallerUtil::GetRdsList(packageId, pDeletedList.get(), pAddedList.get(), pModifiedList.get()); TryReturn(res, INSTALLER_ERROR_INTERNAL_STATE, "GetRdsList() failed"); - PackageInfo* pPackageInfo = _PackageManagerImpl::GetInstance()->GetPackageInfoN(packageId); - TryReturn(pPackageInfo != null, INSTALLER_ERROR_INTERNAL_STATE, "GetPackageInfoN() failed"); + std::unique_ptr< PackageInfo > pPackageInfo(_PackageManagerImpl::GetInstance()->GetPackageInfoN(packageId)); + TryReturn(pPackageInfo, INSTALLER_ERROR_INTERNAL_STATE, "GetPackageInfoN() failed."); - _PackageInfoImpl* pPackageInfoImpl = _PackageInfoImpl::GetInstance(pPackageInfo); + _PackageInfoImpl* pPackageInfoImpl = _PackageInfoImpl::GetInstance(pPackageInfo.get()); TryReturn(pPackageInfoImpl, INSTALLER_ERROR_INTERNAL_STATE, "GetInstance() failed"); String rootPath = pPackageInfoImpl->GetAppRootPath(); -- 2.7.4