Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 820ACDFFB for ; Wed, 5 Sep 2012 04:45:02 +0000 (UTC) Received: (qmail 82577 invoked by uid 500); 5 Sep 2012 04:45:01 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 82309 invoked by uid 500); 5 Sep 2012 04:44:55 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 82280 invoked by uid 99); 5 Sep 2012 04:44:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Sep 2012 04:44:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Sep 2012 04:44:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4506123889C5; Wed, 5 Sep 2012 04:44:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1380986 - /incubator/ooo/trunk/main/svx/source/form/fmundo.cxx Date: Wed, 05 Sep 2012 04:44:10 -0000 To: ooo-commits@incubator.apache.org From: zhangjf@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120905044410.4506123889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: zhangjf Date: Wed Sep 5 04:44:09 2012 New Revision: 1380986 URL: http://svn.apache.org/viewvc?rev=1380986&view=rev Log: #i120746#, the FormScriptingEnvironment object created in the FmXUndoEnvironment ctor is never released Found by: zhangjf Patch by: zhangjf Modified: incubator/ooo/trunk/main/svx/source/form/fmundo.cxx Modified: incubator/ooo/trunk/main/svx/source/form/fmundo.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/form/fmundo.cxx?rev=1380986&r1=1380985&r2=1380986&view=diff ============================================================================== --- incubator/ooo/trunk/main/svx/source/form/fmundo.cxx (original) +++ incubator/ooo/trunk/main/svx/source/form/fmundo.cxx Wed Sep 5 04:44:09 2012 @@ -201,6 +201,9 @@ FmXUndoEnvironment::FmXUndoEnvironment(F FmXUndoEnvironment::~FmXUndoEnvironment() { DBG_DTOR(FmXUndoEnvironment,NULL); + if ( !m_bDisposed ) // i120746, call FormScriptingEnvironment::dispose to avoid memory leak + m_pScriptingEnv->dispose(); + if (m_pPropertySetCache) delete static_cast(m_pPropertySetCache); }