Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

checks if buffer size == sizeof(char*), which suggests a bug in the calling code

Browse Source 
This was SVN commit r1983.
This commit is contained in:
janwas 2005-03-10 16:56:13 +00:00
parent 2e13ec5ff1
commit 274771620a
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/lib/string_s.cpp
View File

@ -63,6 +63,14 @@
} \
)
// raise a debug warning if <len> is the size of a pointer.
// catches bugs such as: tchar* s = ..; tcpy_s(s, sizeof(s), T(".."));
// if warnings get annoying, replace with debug_out. usable as a statement.
#define WARN_IF_PTR_LEN(len) STMT( \
if(len == sizeof(char*)) \
debug_warn("make sure string buffer size is correct");\
)
// skip the functions on VC2005 (already provided there), but not our
// self-test and the t* defines (needed for test).
@ -78,6 +86,8 @@ size_t tlen_s(const tchar* str, size_t max_len)
// note: we can't bail - what would the return value be?
assert2(str != 0);
WARN_IF_PTR_LEN(max_len);
size_t len;
for(len = 0; len < max_len; len++)
if(*str++ == '\0')
@ -104,6 +114,9 @@ int tncpy_s(tchar* dst, size_t max_dst_chars, const tchar* src, size_t max_src_c
*dst = '\0'; // in case src ENFORCE is triggered
ENFORCE(src != 0, EINVAL);
WARN_IF_PTR_LEN(max_dst_chars);
WARN_IF_PTR_LEN(max_src_chars);
// copy string until null character encountered or limit reached.
// optimized for size (less comparisons than MS impl) and
// speed (due to well-predicted jumps; we don't bother unrolling).
@ -150,6 +163,9 @@ int tncat_s(tchar* dst, size_t max_dst_chars, const tchar* src, size_t max_src_c
ENFORCE(max_dst_chars != 0, ERANGE);
// src is checked in tncpy_s
// WARN_IF_PTR_LEN not necessary: both max_dst_chars and max_src_chars
// are checked by tlen_s / tncpy_s (respectively).
const size_t dst_len = tlen_s(dst, max_dst_chars);
if(dst_len == max_dst_chars)
{
@ -191,6 +207,8 @@ int tcat_s(tchar* dst, size_t max_dst_chars, const tchar* src)
static int test()
{
// note: avoid 4-byte strings - they would trigger WARN_IF_PTR_LEN.
const tchar* s0 = T("");
const tchar* s1 = T("a");
const tchar* s5 = T("abcde");