Andras Timar
b8459392b3
Many callers pass the result of Chart2ModelContact::getDocumentModel() which resolves a WeakReference<ChartModel> and can return null if the model has been destroyed. Add null checks matching the existing pattern in ControllerLockHelper::lockControllers/unlockControllers. The crash was caused by a race condition where the ChartModel weak reference (held in Chart2ModelContact) had expired by the time the chart wrapper code tried to lock controllers during a Copy operation. The fix gracefully handles the null case instead of dereferencing a null pointer. Change-Id: I43294de12b84cefb062ada12e8a570ad3b7ea571 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200268 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit e819e77fe79e8eb48bb3e977fadaffa9e99786f2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204885 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
84 lines
2.2 KiB
C++
84 lines
2.2 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <ControllerLockGuard.hxx>
|
|
#include <ChartModel.hxx>
|
|
#include <utility>
|
|
|
|
namespace chart
|
|
{
|
|
|
|
ControllerLockGuardUNO::ControllerLockGuardUNO( rtl::Reference<::chart::ChartModel> xModel ) :
|
|
mxModel(std::move( xModel ))
|
|
{
|
|
if( mxModel.is())
|
|
mxModel->lockControllers();
|
|
}
|
|
|
|
ControllerLockGuardUNO::~ControllerLockGuardUNO()
|
|
{
|
|
if( mxModel.is())
|
|
mxModel->unlockControllers();
|
|
}
|
|
|
|
ControllerLockGuard::ControllerLockGuard( ChartModel& rModel ) :
|
|
mrModel( rModel )
|
|
{
|
|
mrModel.lockControllers();
|
|
}
|
|
|
|
ControllerLockGuard::~ControllerLockGuard()
|
|
{
|
|
mrModel.unlockControllers();
|
|
}
|
|
|
|
ControllerLockHelper::ControllerLockHelper( rtl::Reference<::chart::ChartModel> xModel ) :
|
|
m_xModel(std::move( xModel ))
|
|
{}
|
|
|
|
ControllerLockHelper::~ControllerLockHelper()
|
|
{}
|
|
|
|
void ControllerLockHelper::lockControllers()
|
|
{
|
|
if( m_xModel.is())
|
|
m_xModel->lockControllers();
|
|
}
|
|
|
|
void ControllerLockHelper::unlockControllers()
|
|
{
|
|
if( m_xModel.is())
|
|
m_xModel->unlockControllers();
|
|
}
|
|
|
|
ControllerLockHelperGuard::ControllerLockHelperGuard( ControllerLockHelper & rHelper ) :
|
|
m_rHelper( rHelper )
|
|
{
|
|
m_rHelper.lockControllers();
|
|
}
|
|
|
|
ControllerLockHelperGuard::~ControllerLockHelperGuard()
|
|
{
|
|
m_rHelper.unlockControllers();
|
|
}
|
|
|
|
} // namespace chart
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|