From c79c5d8066538001959f18cab81f74bd6dacf4c8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 14 Aug 2015 11:45:09 +0200 Subject: tdf#92446: Revert apparently bogus attempt at fixing a memory leak 6b4c596b01039324cfe78f38c4e3ffb9080bcd34 "Fix memory leak for BASIC sub (as well as void function)," from just looking at the few lines of code in isolation, and their revision history, looked like a plausible and effective approach to fix the leaks reported by CppunitTest_basci_vba when run under lsan. However, tdf#92446 indicates that that innocent-looking change had rather dire consequences. So revert it and leave a fix for the memory leak to somebody who actually understands all this code. Change-Id: Ic81b1c14a1cfb07c6ec4415cc26b2f826adbc8ca (cherry picked from commit 9d094b9f0a05d2ea62181201efb8f9e46ecfc8f1) --- basic/source/classes/sbxmod.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'basic/source') diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 568340e6782b..e6375e272905 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2142,13 +2142,8 @@ void SbMethod::Broadcast( sal_uIntPtr nHintId ) if( mpPar.Is() ) { // Enregister this as element 0, but don't reset the parent! - switch( GetType() ) { - case SbxEMPTY: - case SbxVOID: - break; - default: + if( GetType() != SbxVOID ) { mpPar->PutDirect( pThisCopy, 0 ); - break; } SetParameters( NULL ); } -- cgit v1.2.3