extensions/source/update/check/updatecheck.cxx | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit f7a77ec55a94bcac13cde7c7e7644d70771b6098
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun May 24 09:58:49 2020 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun May 24 09:59:32 2020 +0200
Revert "Fix leak in extensions/updatecheck"
This reverts commit 05ab836cf3001093a6e375bcb3e4654bbedcfa52 since it's
wrong
Reason for revert: <INSERT REASONING HERE>
Change-Id: Ibdc97c6507fb081e34fdaabd65f61a01057300f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94676
Tested-by: Julien Nabet <serval2...@yahoo.fr>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/extensions/source/update/check/updatecheck.cxx
b/extensions/source/update/check/updatecheck.cxx
index 217c05986129..a4e18c193046 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <comphelper/scopeguard.hxx>
#include <config_folders.h>
#include "updatecheck.hxx"
@@ -137,12 +136,6 @@ OUString getImageFromFileName(const OUString& aFile)
nullptr, &hOut, nullptr // [out]
File handles for redirected I/O
);
- // Create a guard to ensure correct cleanup in its dtor in any case
- comphelper::ScopeGuard g([hOut, hProcess] () {
- osl_closeFile(hOut);
- osl_freeProcessHandle(hProcess);
- });
-
if( osl_Process_E_None == rc )
{
oslProcessInfo aInfo;
@@ -176,6 +169,9 @@ OUString getImageFromFileName(const OUString& aFile)
return aImageName;
}
}
+
+ osl_closeFile(hOut);
+ osl_freeProcessHandle(hProcess);
}
}
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
