From 8a87d1985e4d74f4a6e29ae3a848ef1a4ec03fc8 Mon Sep 17 00:00:00 2001 From: Buginator Date: Thu, 21 May 2009 19:23:42 +0000 Subject: [PATCH] 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 --- lib/framework/string_ext.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/framework/string_ext.h b/lib/framework/string_ext.h index afbd51b66..352531d7e 100644 --- a/lib/framework/string_ext.h +++ b/lib/framework/string_ext.h @@ -25,7 +25,8 @@ extern "C" { #endif -#include "wzglobal.h" +#include "frame.h" +#include "debug.h" #include #include #include @@ -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) { - 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) { - assert(dest != NULL); - strncpy(dest, src, size - 1); - // Guarantee to nul-terminate dest[size - 1] = '\0'; } @@ -113,14 +112,15 @@ static inline size_t strlcat(char *dest, const char *src, size_t size) { 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); if (size > 0) { size_t dlen; - assert(dest != NULL); dlen = strnlen1(dest, size); len += dlen;