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

[Eike Rathke]

 sc/source/ui/unoobj/filtuno.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9950f79867c4a7c2d4c542db754c5d24028fadf
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jul 19 21:24:06 2017 +0200

    Fix crash when saving new spreadsheet as dBase/.dbf, tdf#108789 follow-up
    
    ... as there is no input stream.
    
    Regression from
    
        commit 7f1465a9599e9665159dd2d823a6e9064cca5703
        Date:   Sun Jun 25 17:21:45 2017 +0200
    
    Change-Id: Ib97a4878fe8cf28e5d0f1dc6cc07800ea1635e68
    (cherry picked from commit 22ae038a56b85e86219922c2759544545f2d813d)
    Reviewed-on: https://gerrit.libreoffice.org/40208
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 65de5d10b4e9..e98155e7688d 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -72,7 +72,7 @@ namespace
 
     charsetSource load_CharSet(rtl_TextEncoding &nCharSet, bool bExport, SvStream* dbf_Stream)
     {
-        if (dbfReadCharset(nCharSet, dbf_Stream))
+        if (dbf_Stream && dbfReadCharset(nCharSet, dbf_Stream))
         {
             return charsetSource::charset_from_file;
         }