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

[Caolán McNamara (via logerrit)]

 scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java |    2 +-
 vcl/source/gdi/pdfwriter_impl.cxx                                                   |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 51a596866d31544c75ca0f7314c4ffc8258c32d8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jul 20 14:33:57 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jul 20 19:02:59 2019 +0200

    cid#1448526 RANGE: Range checks
    
    Change-Id: I3b9d9c648151b2a5b9cc6a015b88a59fa7ec4e53
    Reviewed-on: https://gerrit.libreoffice.org/76003
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index 8291231e734f..078f63395384 100644
--- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -226,7 +226,7 @@ public class SecurityDialog extends WeakBase implements
 
     // XServiceInfo
     public String[] getSupportedServiceNames() {
-        String[] retValue = new String[0];
+        String[] retValue = new String[1];
         retValue[0] = __serviceName;
         return retValue;
     }
commit da6f7b73627e699c3c05077fe89fc66e97af6246
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jul 20 14:50:04 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jul 20 19:02:35 2019 +0200

    cid#1448527 Unchecked return value
    
    Change-Id: I31c7cc4ee308c7e3841067b5bc5536ac1382e941
    Reviewed-on: https://gerrit.libreoffice.org/76010
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 4e054f673ca0..6515344d0644 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5165,7 +5165,8 @@ sal_Int32 PDFWriterImpl::emitOutputIntent()
     if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return 0;
     //get file position
     sal_uInt64 nBeginStreamPos = 0;
-    m_aFile.getPos(nBeginStreamPos);
+    if (osl::File::E_None != m_aFile.getPos(nBeginStreamPos))
+        return 0;
     beginCompression();
     checkAndEnableStreamEncryption( nICCObject );
     cmsHPROFILE hProfile = cmsCreate_sRGBProfile();