From ce790dcd3add71ddb2c0ce8ef7c7450f601403d3 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Wed, 26 Oct 2022 23:51:49 -0400 Subject: [PATCH] Fix crash on macOS when unlocking database * Fix #8639 --- src/touchid/TouchID.mm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/touchid/TouchID.mm b/src/touchid/TouchID.mm index 7d6332cc2..688ddc451 100644 --- a/src/touchid/TouchID.mm +++ b/src/touchid/TouchID.mm @@ -31,7 +31,11 @@ inline std::string StatusToErrorMessage(OSStatus status) return std::to_string(status); } - std::string result(CFStringGetCStringPtr(text, kCFStringEncodingUTF8)); + auto msg = CFStringGetCStringPtr(text, kCFStringEncodingUTF8); + std::string result; + if (msg) { + result = msg; + } CFRelease(text); return result; }