From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 6 Sep 2022 10:38:55 +0000 (+0100)
Subject: CVE-2022-3140: check impress/calc IFrame "FrameURL" target
X-Git-Tag: archive/raspbian/1%6.1.5-3+rpi1+deb10u8^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab5abef169c19eca190f2b5c9e6e2ba6cfa8fa4b;p=libreoffice.git

CVE-2022-3140: check impress/calc IFrame "FrameURL" target

similar to

commit c7450d0b9d02c64ae3da467d329040787039767e
Date:   Tue Aug 30 17:01:08 2022 +0100

    check IFrame "FrameURL" target

Conflicts:
	xmloff/source/draw/ximpshap.cxx

Change-Id: Ibf28c29acb4476830431d02772f3ecd4b23a6a27
origin: https://github.com/LibreOffice/core/commit/50c9ae7573f5d63a7cdbcd2caea0d789e97c3a3f.patch

Gbp-Pq: Name 0074-CVE-2022-3140-check-impress-calc-IFrame-FrameURL-tar.patch
---

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 44218ceb0e2..6dae1b00a8b 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -83,6 +83,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/vector/b2dvector.hxx>
+#include <tools/urlobj.hxx>
 #include <o3tl/safeint.hxx>
 
 #include <config_features.h>
@@ -3249,6 +3250,9 @@ void SdXMLFloatingFrameShapeContext::StartElement( const css::uno::Reference< cs
 
             if( !maHref.isEmpty() )
             {
+                if (INetURLObject(maHref).GetProtocol() == INetProtocol::Macro)
+                    GetImport().NotifyMacroEventRead();
+
                 xProps->setPropertyValue("FrameURL", Any(maHref) );
             }
         }