thirdparty/dosbox-staging
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Use safe_sprintf in safe_strcpy

Browse source
This commit is contained in:
kcgen 2021-10-21 15:03:59 -07:00 • committed by kcgen
parent 78077ec3e0
commit 7d5b8d06d5
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
include/string_utils.h
View file

@ -28,6 +28,20 @@
#include <cstring>
#include <string>
template <size_t N>
int safe_sprintf(char (&dst)[N], const char *fmt, ...)
GCC_ATTRIBUTE(format(printf, 2, 3));
template <size_t N>
int safe_sprintf(char (&dst)[N], const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
const int ret = vsnprintf(dst, N, fmt, args);
va_end(args);
return ret;
}
/* Copy a string into C array
*
* This function copies string pointed by src to a fixed-size buffer dst.
@ -56,8 +70,8 @@ char *safe_strcpy(char (&dst)[N], const char *src) noexcept
{
assert(src != nullptr);
assert(src < &dst[0] || src > &dst[N - 1]);
snprintf(dst, N, "%s", src);
return &dst[0];
const auto rcode = safe_sprintf(dst, "%s", src);
return (rcode >= 0) ? &dst[0] : nullptr;
}
template <size_t N>
@ -74,20 +88,6 @@ size_t safe_strlen(char (&str)[N]) noexcept
return strnlen(str, N - 1);
}
template <size_t N>
int safe_sprintf(char (&dst)[N], const char *fmt, ...)
GCC_ATTRIBUTE(format(printf, 2, 3));
template <size_t N>
int safe_sprintf(char (&dst)[N], const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
const int ret = vsnprintf(dst, N, fmt, args);
va_end(args);
return ret;
}
template <size_t N>
bool starts_with(const char (&pfx)[N], const char *str) noexcept
{