From 2edac33c5849c90b0ea0acc918385259dbfbf3ed Mon Sep 17 00:00:00 2001 From: Palana Date: Sat, 4 Oct 2014 21:46:09 +0200 Subject: [PATCH] libobs/util: Write 0 character when converting empty strings Fixes log_windows_version logging garbage for build when running with debug heap enabled (assuming osvi.szCSDVersion is an empty string) --- libobs/util/platform.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libobs/util/platform.c b/libobs/util/platform.c index af4a19a52..93e0c837e 100644 --- a/libobs/util/platform.c +++ b/libobs/util/platform.c @@ -244,7 +244,7 @@ size_t os_mbs_to_wcs(const char *str, size_t len, wchar_t *dst, size_t dst_size) out_len = dst ? (dst_size - 1) : mbstowcs(NULL, str, len); - if (len && dst) { + if (dst) { if (!dst_size) return 0; @@ -269,7 +269,7 @@ size_t os_utf8_to_wcs(const char *str, size_t len, wchar_t *dst, in_len = len ? len : strlen(str); out_len = dst ? (dst_size - 1) : utf8_to_wchar(str, in_len, NULL, 0, 0); - if (out_len && dst) { + if (dst) { if (!dst_size) return 0; @@ -292,7 +292,7 @@ size_t os_wcs_to_mbs(const wchar_t *str, size_t len, char *dst, size_t dst_size) out_len = dst ? (dst_size - 1) : wcstombs(NULL, str, len); - if (len && dst) { + if (dst) { if (!dst_size) return 0; @@ -317,7 +317,7 @@ size_t os_wcs_to_utf8(const wchar_t *str, size_t len, char *dst, in_len = (len != 0) ? len : wcslen(str); out_len = dst ? (dst_size - 1) : wchar_to_utf8(str, in_len, NULL, 0, 0); - if (out_len && dst) { + if (dst) { if (!dst_size) return 0;