[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - hwpfilter/source

Caolán McNamara caolanm at redhat.com
Thu Feb 22 09:08:14 UTC 2018


 hwpfilter/source/hcode.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8381d6b95caf5dabf671861e1cafa24596584dfa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 20 16:33:38 2018 +0000

    forcepoint #2
    
    Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
    
    Change-Id: Ie2b644a3c4c1c165334768eea73d451f07f97def
    Reviewed-on: https://gerrit.libreoffice.org/50081
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index 1e0170401dca..31423c0a3db2 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -1217,6 +1217,8 @@ hchar_string hstr2ucsstr(hchar const* hstr)
 hchar_string kstr2hstr(unsigned char const* src)
 {
     hchar_string ret;
+    if (!src)
+        return ret;
     for (unsigned int i = 0; src[i] != '\0' ; i++)
     {
         if ( src[i] < 127 )


More information about the Libreoffice-commits mailing list