core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/unoidl/unomodel.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3446419b22a50a9baa5e57aa3939025b4417d843
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 22 12:04:30 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Aug 22 15:34:01 2024 +0200

    null deref seen in SdXImpressDocument::getPostIts
    
    Change-Id: Idb222476c6d2a6bb8e3ffea528ec4bed0c869ac8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172252
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 247c4810b9e8..df18005f934d 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2697,12 +2697,13 @@ Size SdXImpressDocument::getDocumentSize()
 void SdXImpressDocument::getPostIts(::tools::JsonWriter& rJsonWriter)
 {
     auto commentsNode = rJsonWriter.startNode("comments");
+    if (!mpDoc)
+        return;
     // Return annotations on master pages too ?
     const sal_uInt16 nMaxPages = mpDoc->GetPageCount();
-    SdPage* pPage;
     for (sal_uInt16 nPage = 0; nPage < nMaxPages; ++nPage)
     {
-        pPage = static_cast<SdPage*>(mpDoc->GetPage(nPage));
+        SdrPage* pPage = mpDoc->GetPage(nPage);
 
         for (auto const& xAnnotation : pPage->getAnnotations())
         {