[Libreoffice-commits] core.git: desktop/source

[Caolán McNamara (via logerrit)]

 desktop/source/lib/init.cxx |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 58732c0760478d00dbf34c8d631e75a0262a2b75
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Feb 7 16:35:11 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Feb 7 19:55:00 2023 +0000

    cid#1520802 Dereference null return value
    
    Change-Id: Iba193386d1ee82c8f47ece2445cfb2ecaeeed998
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146636
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9eb8fc64547b..d0eda23e0eb8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7190,18 +7190,24 @@ void setLanguageToolConfig()
         const char* pRestProtocol = ::getenv("LANGUAGETOOL_RESTPROTOCOL");
 
         OUString aEnabled = OStringToOUString(pEnabled, RTL_TEXTENCODING_UTF8);
-        OUString aSSLVerification = OStringToOUString(pSSLVerification, 
RTL_TEXTENCODING_UTF8);
         if (aEnabled != "true")
             return;
         OUString aBaseUrl = OStringToOUString(pBaseUrlString, 
RTL_TEXTENCODING_UTF8);
-        OUString aRestProtocol = OStringToOUString(pRestProtocol, 
RTL_TEXTENCODING_UTF8);
         try
         {
             SvxLanguageToolOptions& rLanguageOpts = 
SvxLanguageToolOptions::Get();
             rLanguageOpts.setBaseURL(aBaseUrl);
             rLanguageOpts.setEnabled(true);
-            rLanguageOpts.setSSLVerification(aSSLVerification == "true");
-            rLanguageOpts.setRestProtocol(aRestProtocol);
+            if (pSSLVerification)
+            {
+                OUString aSSLVerification = 
OStringToOUString(pSSLVerification, RTL_TEXTENCODING_UTF8);
+                rLanguageOpts.setSSLVerification(aSSLVerification == "true");
+            }
+            if (pRestProtocol)
+            {
+                OUString aRestProtocol = OStringToOUString(pRestProtocol, 
RTL_TEXTENCODING_UTF8);
+                rLanguageOpts.setRestProtocol(aRestProtocol);
+            }
             if (pUsername && pApikey)
             {
                 OUString aUsername = OStringToOUString(pUsername, 
RTL_TEXTENCODING_UTF8);