[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - basic/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Oct 20 12:43:50 UTC 2018


 basic/source/runtime/dllmgr-x64.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7951138541caabcd25fccaa8f9ebb0226ce2ce12
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Oct 19 14:54:28 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Sat Oct 20 14:43:29 2018 +0200

    tdf#120706: nullptr dereference
    
    Change-Id: I55814a6b4cdfda93a51621b5b31c166507a7e7a6
    Reviewed-on: https://gerrit.libreoffice.org/62005
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 49d304c4f6635381a27b60a8944744cc81ff1e91)
    Reviewed-on: https://gerrit.libreoffice.org/62028
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 2c311861122a..85af90b53f79 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -475,7 +475,7 @@ ErrCode call(
     OUString const & dll, ProcData const & proc, SbxArray * arguments,
     SbxVariable & result)
 {
-    if (arguments->Count() > 20)
+    if (arguments && arguments->Count() > 20)
         return ERRCODE_BASIC_NOT_IMPLEMENTED;
 
     std::vector< char > stack;


More information about the Libreoffice-commits mailing list