Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

string: fix sprintf

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2024-01-05 17:01:43 +01:00
parent 0eebde6d81
commit 1685cd3283
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
include/stdex/string.hpp
View File

@ -2320,42 +2320,24 @@ namespace stdex
/// \cond internal /// \cond internal
inline int vsnprintf(_Out_z_cap_(capacity) char* str, _In_ size_t capacity, _In_z_ _Printf_format_string_params_(2) const char* format, _In_opt_ locale_t locale, _In_ va_list arg) inline int vsnprintf(_Out_z_cap_(capacity) char* str, _In_ size_t capacity, _In_z_ _Printf_format_string_params_(2) const char* format, _In_opt_ locale_t locale, _In_ va_list arg)
{ {
int r;
#ifdef _WIN32 #ifdef _WIN32
// Don't use _vsnprintf_s(). It terminates the string even if we want to print to the edge of the buffer. // Don't use _vsnprintf_s(). It terminates the string even if we want to print to the edge of the buffer.
#pragma warning(suppress: 4996) #pragma warning(suppress: 4996)
r = _vsnprintf_l(str, capacity, format, locale, arg); return _vsnprintf_l(str, capacity, format, locale, arg);
#else #else
r = ::vsnprintf(str, capacity, format, arg); return ::vsnprintf(str, capacity, format, arg);
#endif #endif
if (r == -1 && strnlen(str, capacity) == capacity) {
// Buffer overrun. Estimate buffer size for the next iteration.
capacity += std::max<size_t>(capacity / 8, 0x80);
if (capacity > INT_MAX)
throw std::invalid_argument("string too big");
return (int)capacity;
}
return r;
} }
inline int vsnprintf(_Out_z_cap_(capacity) wchar_t* str, _In_ size_t capacity, _In_z_ _Printf_format_string_params_(2) const wchar_t* format, _In_opt_ locale_t locale, _In_ va_list arg) inline int vsnprintf(_Out_z_cap_(capacity) wchar_t* str, _In_ size_t capacity, _In_z_ _Printf_format_string_params_(2) const wchar_t* format, _In_opt_ locale_t locale, _In_ va_list arg)
{ {
int r;
#ifdef _WIN32 #ifdef _WIN32
// Don't use _vsnwprintf_s(). It terminates the string even if we want to print to the edge of the buffer. // Don't use _vsnwprintf_s(). It terminates the string even if we want to print to the edge of the buffer.
#pragma warning(suppress: 4996) #pragma warning(suppress: 4996)
r = _vsnwprintf_l(str, capacity, format, locale, arg); return _vsnwprintf_l(str, capacity, format, locale, arg);
#else #else
r = vswprintf(str, capacity, format, arg); return vswprintf(str, capacity, format, arg);
#endif #endif
if (r == -1 && strnlen(str, capacity) == capacity) {
// Buffer overrun. Estimate buffer size for the next iteration.
capacity += std::max<size_t>(capacity / 8, 0x80);
if (capacity > INT_MAX)
throw std::invalid_argument("string too big");
return (int)capacity;
}
return r;
} }
/// \endcond /// \endcond
@ -2375,21 +2357,28 @@ namespace stdex
T buf[1024 / sizeof(T)]; T buf[1024 / sizeof(T)];
// Try with stack buffer first. // Try with stack buffer first.
int count = vsnprintf(buf, _countof(buf) - 1, format, locale, arg); int count = vsnprintf(buf, _countof(buf), format, locale, arg);
if (count >= 0) { if (0 <= count && count < _countof(buf)) {
// Copy from stack. // Copy from stack.
str.append(buf, count); str.append(buf, count);
return count; return count;
} }
for (size_t capacity = 2 * 1024 / sizeof(T);; capacity *= 2) { if (count < 0) {
// Allocate on heap and retry. switch (errno) {
auto buf_dyn = std::make_unique<T[]>(capacity); case 0:
count = vsnprintf(buf_dyn.get(), capacity - 1, format, locale, arg); count = vsnprintf(NULL, 0, format, locale, arg);
if (count >= 0) { break;
str.append(buf_dyn.get(), count); case EINVAL: throw std::invalid_argument("invalid vsnprintf arguments");
return count; case EILSEQ: throw std::runtime_error("encoding error");
default: throw std::runtime_error("failed to format string");
} }
} }
auto buf_dyn = std::make_unique<T[]>(count + 1);
count = vsnprintf(buf_dyn.get(), count + 1, format, locale, arg);
if (count < 0) _Unlikely_
throw std::runtime_error("failed to format string");
str.append(buf_dyn.get(), count);
return count;
} }
/// ///