From 279487b53ac876bb8ece9e5c2ec2882ca077bf13 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Sat, 18 Dec 2021 22:01:39 +0200
Subject: use cppu::BaseMutex in SvXMLGraphicHelper

because passing a ref of a local member to a parent class
means passing uninitialised data

Change-Id: I1171c3e5f5df148c7e63dad451bf54dff23fe2aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127119
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 svx/source/xml/xmlgrhlp.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'svx')

diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 43195d1db82c..35d3a247c56a 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -369,7 +369,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
 SvXMLGraphicHelper::SvXMLGraphicHelper(SvXMLGraphicHelperMode eCreateMode)
     : cppu::WeakComponentImplHelper<document::XGraphicObjectResolver,
                                     document::XGraphicStorageHandler,
-                                    document::XBinaryStreamResolver>(maMutex)
+                                    document::XBinaryStreamResolver>(m_aMutex)
 {
     Init( nullptr, eCreateMode );
 }
@@ -377,7 +377,7 @@ SvXMLGraphicHelper::SvXMLGraphicHelper(SvXMLGraphicHelperMode eCreateMode)
 SvXMLGraphicHelper::SvXMLGraphicHelper()
     : cppu::WeakComponentImplHelper<document::XGraphicObjectResolver,
                                     document::XGraphicStorageHandler,
-                                    document::XBinaryStreamResolver>(maMutex)
+                                    document::XBinaryStreamResolver>(m_aMutex)
     , meCreateMode(SvXMLGraphicHelperMode::Read)
 {
 }
@@ -580,7 +580,7 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& /
 // XGraphicStorageHandler
 uno::Reference<graphic::XGraphic> SAL_CALL SvXMLGraphicHelper::loadGraphic(OUString const & rURL)
 {
-    osl::MutexGuard aGuard(maMutex);
+    osl::MutexGuard aGuard(m_aMutex);
 
     uno::Reference<graphic::XGraphic> xGraphic;
 
@@ -612,7 +612,7 @@ uno::Reference<graphic::XGraphic> SAL_CALL SvXMLGraphicHelper::loadGraphic(OUStr
 
 uno::Reference<graphic::XGraphic> SAL_CALL SvXMLGraphicHelper::loadGraphicFromOutputStream(uno::Reference<io::XOutputStream> const & rxOutputStream)
 {
-    osl::MutexGuard aGuard(maMutex);
+    osl::MutexGuard aGuard(m_aMutex);
 
     uno::Reference<graphic::XGraphic> xGraphic;
 
-- 
cgit