[Libreoffice-commits] core.git: pyuno/source

[Caolán McNamara (via logerrit)]

 pyuno/source/module/pyuno_runtime.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 962a9ce0a1ebe63f341fa27af8203991c44dd56f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Mar 22 10:17:17 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 22 13:15:08 2021 +0100

    cid#1473905 Dereference after null check
    
    Change-Id: I949971374a68156ba78dce3b8d058774b1bef816
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112872
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 91caaffb457c..10257a8ef69e 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -638,9 +638,9 @@ bool Runtime::pyIterUnpack( PyObject *const pObj, Any &a ) const
     return true;
 }
 
-Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) const
+Any Runtime::pyObject2Any(const PyRef & source, enum ConversionMode mode) const
 {
-    if( ! impl->cargo->valid )
+    if (!impl || !impl->cargo->valid)
     {
         throw RuntimeException("pyuno runtime must be initialized before calling any2PyObject" );
     }