[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Caolán McNamara]

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

New commits:
commit fb0211306ff7db125d7823d920cc54cff010de9e
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sat Mar 22 16:06:35 2014 +0000

    coverity#705969 Dereference before null check
    
    Change-Id: Icb19931bb529e6c2b98621a603cdb86011d68a9e
    (cherry picked from commit 51452b7afe858139076010decbe04758321a8396)
    Reviewed-on: https://gerrit.libreoffice.org/8733
    Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
    Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index a3f976b..e20c79e 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -714,7 +714,7 @@ bool Printer::StartJob( const OUString& i_rJobName, 
boost::shared_ptr<vcl::Print
 
             if( bError )
             {
-                mnError = ImplSalPrinterErrorCodeToVCL( 
mpPrinter->GetErrorCode() );
+                mnError = mpPrinter ? 
ImplSalPrinterErrorCodeToVCL(mpPrinter->GetErrorCode()) : 0;
                 if ( !mnError )
                     mnError = PRINTER_GENERALERROR;
                 i_pController->setJobState( mnError == PRINTER_ABORT

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits