From cc4cf1da5a68bf4e20f82e97e7dbd4babfad3da1 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 3 Dec 2021 18:07:17 -0600 Subject: [PATCH] fixup! refactor: use cpputf for utf8 validation and conversion (#2251) (#2264) silence a nullptr-dereference warning --- libtransmission/utils.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc index 124fda8de..27d652d90 100644 --- a/libtransmission/utils.cc +++ b/libtransmission/utils.cc @@ -788,8 +788,11 @@ bool tr_utf8_validate(std::string_view sv, char const** good_end) static char* strip_non_utf8(std::string_view sv) { char* ret = tr_new(char, std::size(sv) + 1); - auto const it = utf8::unchecked::replace_invalid(std::data(sv), std::data(sv) + std::size(sv), ret, '?'); - *it = '\0'; + if (ret != nullptr) + { + auto const it = utf8::unchecked::replace_invalid(std::data(sv), std::data(sv) + std::size(sv), ret, '?'); + *it = '\0'; + } return ret; }