core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/filter/png/PngImageReader.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6c7d102b4b6fdbf687e907c0266a91a013a78872
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu May 15 10:23:27 2025 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu May 15 17:13:50 2025 +0200

    ofz#417428651 Null-dereference WRITE
    
    Change-Id: I67e12ee72cece647df43cba6cd3074df75351951
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185353
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/vcl/source/filter/png/PngImageReader.cxx 
b/vcl/source/filter/png/PngImageReader.cxx
index b99232f29f49..eff637cdddf1 100644
--- a/vcl/source/filter/png/PngImageReader.cxx
+++ b/vcl/source/filter/png/PngImageReader.cxx
@@ -884,7 +884,12 @@ BitmapEx PngImageReader::read()
 {
     ImportOutput aImportOutput;
     if (read(aImportOutput))
-        return *aImportOutput.moBitmap;
+    {
+        if (!aImportOutput.mbIsAnimated)
+            return *aImportOutput.moBitmap;
+        else
+            return aImportOutput.moAnimation->GetBitmapEx();
+    }
     return BitmapEx();
 }