From 6a2c37b4ed612f7bc030424c6e3d16f021a54b0a Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Fri, 19 Jan 2024 08:03:32 +0000 Subject: [PATCH] Fix 09f585b: Crash if font name ends with comma or comma and whitespace on Linux. (#11838) --- src/os/unix/font_unix.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/os/unix/font_unix.cpp b/src/os/unix/font_unix.cpp index c418cdb772..548fd410cc 100644 --- a/src/os/unix/font_unix.cpp +++ b/src/os/unix/font_unix.cpp @@ -34,6 +34,8 @@ static std::tuple SplitFontFamilyAndStyle(std::string_ if (separator == std::string_view::npos) return { std::string(font_name), std::string() }; auto begin = font_name.find_first_not_of("\t ", separator + 1); + if (begin == std::string_view::npos) return { std::string(font_name.substr(0, separator)), std::string() }; + return { std::string(font_name.substr(0, separator)), std::string(font_name.substr(begin)) }; }