emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

utils: add extra check for #2230

This commit is contained in:
Dirk-Jan C. Binnema 2022-04-16 16:16:08 +03:00
parent acbcbc0b43
commit e9fdf7f01d
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/utils/mu-utils.cc
View File

@ -326,6 +326,19 @@ Mu::date_to_time_t_string(int64_t t)
std::string std::string
Mu::time_to_string(const std::string& frm, time_t t, bool utc) Mu::time_to_string(const std::string& frm, time_t t, bool utc)
{ {
/* Temporary... https://github.com/djcb/mu/issues/2230 */
{
const char *end{};
if (!g_utf8_validate(frm.c_str(), frm.length(), &end)) {
std::string hex{};
for (auto i = 0; i != end - frm.c_str(); ++i)
hex += format("%02x", frm[i]);
g_critical("%s: non-utf8 format (%s)",
__func__, hex.c_str());
return {};
}
}
GDateTime* dt = std::invoke([&] { GDateTime* dt = std::invoke([&] {
if (utc) if (utc)
return g_date_time_new_from_unix_utc(t); return g_date_time_new_from_unix_utc(t);
@ -339,25 +352,14 @@ Mu::time_to_string(const std::string& frm, time_t t, bool utc)
return {}; return {};
} }
char* str = g_date_time_format(dt, frm.c_str()); char* str = g_date_time_format(dt, frm.c_str()); /* always utf8 */
g_date_time_unref(dt); g_date_time_unref(dt);
if (!str) { if (!str) {
g_warning("failed to format time"); g_warning("failed to format time with format '%s'", frm.c_str());
return {}; return {};
} }
/* ensure it's utf8 */ return from_gchars(std::move(str)/*consumed*/);
char* utf8_str = g_locale_to_utf8(str, -1, NULL, NULL, NULL);
g_free(str);
if (!utf8_str) {
g_warning("failed to convert date to utf8");
return {};
}
std::string res{utf8_str};
g_free(utf8_str);
return res;
} }
static std::string static std::string