[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/source

Caolán McNamara caolanm at redhat.com
Mon Jul 13 04:55:19 PDT 2015


 vcl/source/gdi/jobset.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 481240f4ba80c794bc86e1fec7795712f2b08650
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 13 11:02:56 2015 +0100

    min legal size here is > 4
    
    (cherry picked from commit 3131205c05a3fde4ef1e3322cc48ca23c443f6d3)
    
    Change-Id: I9f68d000b32623db4d949d13284043630f5689f4
    (cherry picked from commit 964000d415bcf491704dad57aee7e0656ea60dab)
    Reviewed-on: https://gerrit.libreoffice.org/16995
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index ab6d0cd..67109134 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -222,7 +222,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
     {
         sal_uInt16 nLen = 0;
         rIStream.ReadUInt16( nLen );
-        if ( !nLen )
+        if (nLen <= 4)
             return rIStream;
 
         sal_uInt16 nSystem = 0;


More information about the Libreoffice-commits mailing list