From fac8eff7fab289bcfd746852a9121b0f29a55944 Mon Sep 17 00:00:00 2001 From: ptahmose Date: Mon, 6 Nov 2023 14:54:48 +0100 Subject: [PATCH] fix for crash when libcurl is built w/o SSL-support (#74) * tentative fix * bump version --- CMakeLists.txt | 2 +- Src/libCZI/StreamsLib/curlhttpinputstream.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4220a9f..4ede42bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15) cmake_policy(SET CMP0091 NEW) # enable new "MSVC runtime library selection" (https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html) project(libCZI - VERSION 0.54.1 + VERSION 0.54.2 HOMEPAGE_URL "https://github.com/ZEISS/libczi" DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI") diff --git a/Src/libCZI/StreamsLib/curlhttpinputstream.cpp b/Src/libCZI/StreamsLib/curlhttpinputstream.cpp index 1be11503..2a402791 100644 --- a/Src/libCZI/StreamsLib/curlhttpinputstream.cpp +++ b/Src/libCZI/StreamsLib/curlhttpinputstream.cpp @@ -24,7 +24,7 @@ using namespace libCZI; stringstream string_stream; string_stream << "Version:" << version_info->version; - string_stream << " SSL:" << version_info->ssl_version; + string_stream << " SSL:" << (version_info->ssl_version != nullptr ? version_info->ssl_version : "none"); if (version_info->age >= CURLVERSION_ELEVENTH) { for (size_t i = 0;; ++i)