[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - filter/source

[Szymon KÅ‚os (via logerrit)]

 filter/source/svg/svgexport.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f34eac66e64a416739c36aa996c90ea1869b9f0d
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 25 10:41:11 2021 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Mar 29 14:23:27 2021 +0200

    SVGFilter::implGenerateMetaData check page before use
    
    Avoid crash in online impress:
    1. session A edits the textbox
    2. session B removed slide which is edited by A
    3. session A tries to edit another textbox on other slide
    
    Change-Id: Ic875321107baa48fd2a5b52aa2580a8fcde40823
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113077
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ce12673b795d..f5ab1a67b94a 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1228,6 +1228,8 @@ void SVGFilter::implGenerateMetaData()
             {
                 const Reference< css::drawing::XDrawPage > & xDrawPage = mSelectedPages[i];
                 Reference< css::drawing::XMasterPageTarget > xMasterPageTarget( xDrawPage, UNO_QUERY );
+                if (!xMasterPageTarget.is())
+                    continue;
                 Reference< css::drawing::XDrawPage > xMasterPage = xMasterPageTarget->getMasterPage();
                 OUString aSlideId(aId + "_" + OUString::number( i ));