desktop/source/lib/init.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9c0ca63f2eba1732403c13dd6571c2336fd3bdaf
Author: Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Fri Oct 23 01:35:41 2020 +0300
Commit: Gülşah Köse <gulsah.k...@collabora.com>
CommitDate: Fri Oct 23 16:34:40 2020 +0200
Prevent crash with invalid lang tag.
Change-Id: I778b5b007d4edce946e8b4c26e5a07f12103a968
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104707
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.k...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1acdbd58841b..94e34cf9dca5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2227,8 +2227,9 @@ static LibreOfficeKitDocument*
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
// not pass it as a parameter to the filter
OUString aOptions = getUString(pOptions);
const OUString aLanguage = extractParameter(aOptions, "Language");
+ bool isValidLangTag = LanguageTag::isValidBcp47(aLanguage, nullptr);
- if (!aLanguage.isEmpty())
+ if (!aLanguage.isEmpty() && isValidLangTag)
{
SfxLokHelper::setDefaultLanguage(aLanguage);
// Set the LOK language tag, used for dialog tunneling.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
