Skip to content

libobs: Fix crash with non-ASCII characters in formatted filenames #12964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kellemar wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −2
Open

libobs: Fix crash with non-ASCII characters in formatted filenames #12964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions libobs/util/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,41 @@ static void erase_ch(struct dstr *str, size_t pos)
*str = new_str;
}

size_t os_strftime_utf8(char *dst, size_t dst_size, const char *format, const struct tm *tm)
{
if (!dst || !dst_size || !format || !tm)
return 0;

#ifdef _WIN32
/*
* On Windows, strftime() returns strings encoded in the system's
* ANSI codepage, not UTF-8. This causes issues when locale-specific
* format specifiers (like %Z for timezone) contain non-ASCII
* characters (e.g., German "Mitteleuropäische Zeit").
*
* Use wcsftime() to get proper wide characters, then convert to UTF-8.
*/
wchar_t wformat[64];
wchar_t wdst[256];

size_t format_len = os_utf8_to_wcs(format, 0, wformat, sizeof(wformat) / sizeof(wchar_t));
if (!format_len) {
dst[0] = '\0';
return 0;
}

size_t wlen = wcsftime(wdst, sizeof(wdst) / sizeof(wchar_t), wformat, tm);
if (!wlen) {
dst[0] = '\0';
return 0;
}

return os_wcs_to_utf8(wdst, wlen, dst, dst_size);
#else
return strftime(dst, dst_size, format, tm);
#endif
}

char *os_generate_formatted_filename(const char *extension, bool space, const char *format)
{
time_t now = time(0);
Expand Down Expand Up @@ -727,9 +762,9 @@ char *os_generate_formatted_filename(const char *extension, bool space, const ch

if (astrcmp_n(cmp, spec[i][0], len) == 0) {
if (strlen(spec[i][1]))
strftime(convert, sizeof(convert), spec[i][1], cur_time);
os_strftime_utf8(convert, sizeof(convert), spec[i][1], cur_time);
else
strftime(convert, sizeof(convert), spec[i][0], cur_time);
os_strftime_utf8(convert, sizeof(convert), spec[i][0], cur_time);

dstr_copy(&c, convert);
if (c.len && valid_string(c.array))
Expand Down
2 changes: 2 additions & 0 deletions libobs/util/platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ EXPORT int os_safe_replace(const char *target_path, const char *from_path, const

EXPORT char *os_generate_formatted_filename(const char *extension, bool space, const char *format);

EXPORT size_t os_strftime_utf8(char *dst, size_t dst_size, const char *format, const struct tm *tm);

struct os_inhibit_info;
typedef struct os_inhibit_info os_inhibit_t;

Expand Down