From dd5199aa8fc3f483dd1276edfeb0c4eff39de7b3 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 2 Mar 2022 22:18:56 +0200 Subject: [PATCH] Android: Fix memory leak Reported by Coverity. Change-Id: Ic05716999a0ebdc21a01dc6790da941474257b5d Reviewed-by: Alessandro Portale --- src/plugins/android/avddialog.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index 0f9f25e2295..b44af13720b 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -131,6 +131,10 @@ bool AvdDialog::isValid() const ProjectExplorer::IDevice::Ptr AvdDialog::device() const { + if (!m_createdAvdInfo.systemImage) { + qCWarning(avdDialogLog) << "System image of the created AVD is nullptr"; + return IDevice::Ptr(); + } AndroidDevice *dev = new AndroidDevice(); const Utils::Id deviceId = AndroidDevice::idFromAvdInfo(m_createdAvdInfo); using namespace ProjectExplorer; @@ -140,10 +144,6 @@ ProjectExplorer::IDevice::Ptr AvdDialog::device() const dev->setDeviceState(IDevice::DeviceConnected); dev->setExtraData(Constants::AndroidAvdName, m_createdAvdInfo.name); dev->setExtraData(Constants::AndroidCpuAbi, {m_createdAvdInfo.abi}); - if (!m_createdAvdInfo.systemImage) { - qCWarning(avdDialogLog) << "System image of the created AVD is nullptr"; - return IDevice::Ptr(); - } dev->setExtraData(Constants::AndroidSdk, m_createdAvdInfo.systemImage->apiLevel()); dev->setExtraData(Constants::AndroidAvdSdcard, QString("%1 MB") .arg(m_createdAvdInfo.sdcardSize));