feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fix memory leak in AndroidSdkDownloader::extractSdk()

Browse Source 
put the process on the stack, so we don't need (and fail) to free it.
while at it, remove the pointless close() call.

amends f46099d2.

Change-Id: I4025691bebf2899efe006ee83012aefbb8797a64
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Oswald Buddenhagen
2020-12-09 18:33:15 +01:00
parent 3201d91624
commit 20a3eae86f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/android/androidsdkdownloader.cpp
View File

@@ -118,14 +118,13 @@ bool AndroidSdkDownloader::extractSdk(const QString &jdkPath, const QString &sdk
} }
} }
QProcess *jarExtractProc = new QProcess(); QProcess jarExtractProc;
jarExtractProc->setWorkingDirectory(sdkExtractPath); jarExtractProc.setWorkingDirectory(sdkExtractPath);
QString jarCmdPath(jdkPath + "/bin/jar"); QString jarCmdPath(jdkPath + "/bin/jar");
jarExtractProc->start(jarCmdPath, {"xf", m_sdkFilename}); jarExtractProc.start(jarCmdPath, {"xf", m_sdkFilename});
jarExtractProc->waitForFinished(); jarExtractProc.waitForFinished();
jarExtractProc->close();
return jarExtractProc->exitCode() ? false : true; return jarExtractProc.exitCode() ? false : true;
} }
bool AndroidSdkDownloader::verifyFileIntegrity() bool AndroidSdkDownloader::verifyFileIntegrity()