[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

Jens Carl j.carl43 at gmx.de
Fri Dec 8 18:21:38 UTC 2017


 sc/source/ui/docshell/dbdocfun.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1d6caa96d23eda357277faa919d24ee7af52652a
Author: Jens Carl <j.carl43 at gmx.de>
Date:   Fri Dec 8 09:09:39 2017 +0000

    Fix segfault when ScDBDocFunc::AddDBRange is called ...
    
    multiple time with same name. ScDBCollection::NamedDBs::insert() use an
    unique_ptr to hold ScDBData* and if the insert isn't a success we don't
    have clean up with delete.
    
    Change-Id: I9b24834ea2e2dfd67b07438e6c4789ad0c01b888
    Reviewed-on: https://gerrit.libreoffice.org/46075
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit d51e7581d90d55b5fe9a0f175d3cbee32de51721)
    Reviewed-on: https://gerrit.libreoffice.org/46092
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>
    Tested-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 71426d86ea70..3cc44bb58843 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -96,7 +96,6 @@ bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange )
 
     if (!bOk)
     {
-        delete pNew;
         delete pUndoColl;
         return false;
     }


More information about the Libreoffice-commits mailing list