Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix strlcpy() & strlcat() to use ASSERT_OR_RETURN 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7478 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2009-05-21 19:23:42 +00:00 committed by Git SVN Gateway
parent 9b5225af4d
commit 8a87d1985e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/framework/string_ext.h
View File

@ -25,7 +25,8 @@
extern "C" { extern "C" {
#endif #endif
#include "wzglobal.h" #include "frame.h"
#include "debug.h"
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
#include <assert.h> #include <assert.h>
@ -74,14 +75,12 @@ static inline size_t strnlen1(const char* string, size_t maxlen)
*/ */
static inline size_t strlcpy(char *dest, const char *src, size_t size) static inline size_t strlcpy(char *dest, const char *src, size_t size)
{ {
assert(src != NULL); ASSERT_OR_RETURN(0, src != NULL, "strlcpy was passed an invalid src parameter.");
ASSERT_OR_RETURN(0, dest != NULL, "strlcpy was passed an invalid dest parameter.");
if (size > 0) if (size > 0)
{ {
assert(dest != NULL);
strncpy(dest, src, size - 1); strncpy(dest, src, size - 1);
// Guarantee to nul-terminate // Guarantee to nul-terminate
dest[size - 1] = '\0'; dest[size - 1] = '\0';
} }
@ -113,14 +112,15 @@ static inline size_t strlcat(char *dest, const char *src, size_t size)
{ {
size_t len; size_t len;
assert(src != NULL); ASSERT_OR_RETURN(0, src != NULL, "strlcat was passed an invalid src parameter.");
ASSERT_OR_RETURN(0, dest != NULL, "strlcat was passed an invalid dest parameter.");
len = strlen(src); len = strlen(src);
if (size > 0) if (size > 0)
{ {
size_t dlen; size_t dlen;
assert(dest != NULL);
dlen = strnlen1(dest, size); dlen = strnlen1(dest, size);
len += dlen; len += dlen;