From db240d99cffbc3af2eb39a5f7d48e68e57b85271 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 28 Mar 2024 10:11:07 +0100 Subject: androiddeplyqt: fix more missing pclose() on early returns Found by Coverity. This code predates the move of androiddeployqt to qtbase. Pick-to: 6.7 6.6 6.5 6.2 5.15 Coverity-Id: 378442 Change-Id: Icc24918159132c55a3817eaf19c96ea212dfa6dc Reviewed-by: BogDan Vatra --- src/tools/androiddeployqt/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/tools/androiddeployqt/main.cpp') diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 273e818189..6125b405b5 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2202,6 +2202,7 @@ bool scanImports(Options *options, QSet *usedDependencies) QJsonDocument jsonDocument = QJsonDocument::fromJson(output); if (jsonDocument.isNull()) { fprintf(stderr, "Invalid json output from qmlimportscanner.\n"); + pclose(qmlImportScannerCommand); return false; } @@ -2210,6 +2211,7 @@ bool scanImports(Options *options, QSet *usedDependencies) QJsonValue value = jsonArray.at(i); if (!value.isObject()) { fprintf(stderr, "Invalid format of qmlimportscanner output.\n"); + pclose(qmlImportScannerCommand); return false; } @@ -2255,6 +2257,7 @@ bool scanImports(Options *options, QSet *usedDependencies) if (importPathOfThisImport.isEmpty()) { fprintf(stderr, "Import found outside of import paths: %s.\n", qPrintable(info.absoluteFilePath())); + pclose(qmlImportScannerCommand); return false; } @@ -2322,6 +2325,7 @@ bool scanImports(Options *options, QSet *usedDependencies) } } + pclose(qmlImportScannerCommand); return true; } -- cgit v1.2.3