[Libreoffice-commits] core.git: 2 commits - sd/source vcl/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/FormShellManager.cxx     |    2 +-
 vcl/source/graphic/BinaryDataContainer.cxx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2281c182e181fcfccf526a4ca2364295c7eaa1ee
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Apr 22 21:41:12 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Apr 23 14:08:20 2023 +0200

    cid#1524751 Dereference after null check
    
    Change-Id: I3543b7e251fe6076ad1875bc49abfbe747f45999
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150813
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/graphic/BinaryDataContainer.cxx 
b/vcl/source/graphic/BinaryDataContainer.cxx
index 72d9bac27940..b35195b7d27e 100644
--- a/vcl/source/graphic/BinaryDataContainer.cxx
+++ b/vcl/source/graphic/BinaryDataContainer.cxx
@@ -54,7 +54,8 @@ class ReferencedMemoryStream : public SvMemoryStream
 
 public:
     ReferencedMemoryStream(const std::shared_ptr<std::vector<sal_uInt8>>& 
rData)
-        : SvMemoryStream(rData ? rData->data() : nullptr, rData->size(), 
StreamMode::READ)
+        : SvMemoryStream(rData ? rData->data() : nullptr, rData ? 
rData->size() : 0,
+                         StreamMode::READ)
         , mpData(rData)
     {
     }
commit ed93d660953cb4d15321ee7529a07cd0c8af0ba9
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Apr 22 21:38:26 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Apr 23 14:08:10 2023 +0200

    cid#1401342 Uncaught exception
    
    Change-Id: I16dd5b9adf6f6e87c11bd1cfcbb823c4f683bedd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150812
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sd/source/ui/view/FormShellManager.cxx 
b/sd/source/ui/view/FormShellManager.cxx
index 3efa9bed71bb..bfd1808342ab 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -66,7 +66,7 @@ FormShellManager::FormShellManager (ViewShellBase& rBase)
 
 FormShellManager::~FormShellManager()
 {
-    SetFormShell(nullptr);
+    suppress_fun_call_w_exception(SetFormShell(nullptr));
     UnregisterAtCenterPane();
 
     // Unregister from the EventMultiplexer.