wsd/LOOLWSD.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 040e967a4fffae20171d99be7628e180b9d55f68 Author: Jan Holesovsky <ke...@collabora.com> Date: Wed Nov 29 20:05:28 2017 +0100
Don't crash when ssl.cipher_list is not present in loolwsd.xml. Change-Id: I3834550328ebd8627fc130c6ac2d0fccd2505311 Reviewed-on: https://gerrit.libreoffice.org/45524 Reviewed-by: Aron Budea <aron.bu...@collabora.com> Tested-by: Aron Budea <aron.bu...@collabora.com> diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 102670e7..622396f7 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -927,7 +927,7 @@ void LOOLWSD::initializeSSL() const auto ssl_ca_file_path = getPathFromConfig("ssl.ca_file_path"); LOG_INF("SSL CA file: " << ssl_ca_file_path); - const auto ssl_cipher_list = getPathFromConfig("ssl.cipher_list"); + const auto ssl_cipher_list = config().getString("ssl.cipher_list", ""); LOG_INF("SSL Cipher list: " << ssl_cipher_list); #if ENABLE_SSL _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits