From ccd30d3bb395fd367d8b687fc2b3b13641c8d846 Mon Sep 17 00:00:00 2001 From: Christopher Copits Date: Tue, 1 Jan 2013 16:29:32 -0500 Subject: fdo#53521 Crash when running BASIC's "shell()" with a non-existent program The problem is that the process handle is freed regardless of whether osl_executeProcess was successful or not. Therefore, a segmentation fault would result, as a random memory address would be freed. This patch checks whether osl_executeProcess was successful. If it was, then it frees the handle; if it wasn't successful, the memory is not freed. Change-Id: Ic3af07be06e7af7730a3bcb1680c659a88b66af3 Reviewed-on: https://gerrit.libreoffice.org/1530 Reviewed-by: Michael Stahl Tested-by: Michael Stahl (cherry picked from commit dbfc8777bf73872d1b96f956b9e778d9099d52b3) (cherry picked from commit 96b985145b3efbaf4552adbeccf24bfac2fa71b0) Signed-off-by: Michael Stahl --- basic/source/runtime/methods.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index d54c5063fe8f..fbf688363892 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3294,7 +3294,11 @@ RTLFUNC(Shell) NULL, 0, &pApp ) == osl_Process_E_None; - osl_freeProcessHandle( pApp ); + // 53521 only free process handle on success + if (bSucc) + { + osl_freeProcessHandle( pApp ); + } for(int j = 0; i < nParamCount; i++) { -- cgit