From b826bc2c54dbe6a2ad0f204f36f82bf116d8e663 Mon Sep 17 00:00:00 2001 From: ultramage Date: Sat, 22 Sep 2007 11:02:26 +0000 Subject: * Added 'safestrnlen' to prevent null pointer crashes * Fixed global chat logging always crashing on a null pointer * Applied changes to clif_parse_globalmessage() from my WiP code - clearer processing of the individual packet components - proper code ordering, some more integrity checks - fixes to some poorly chosen ShowWarning() format strings - global chat logging no longer logs the entire string (w/ player name) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11271 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/strlib.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/common/strlib.c') diff --git a/src/common/strlib.c b/src/common/strlib.c index 4f204a768..c0a6238f9 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -310,6 +310,12 @@ char* safestrncpy(char* dst, const char* src, size_t n) return ret; } +/// doesn't crash on null pointer +size_t safestrnlen(const char* string, size_t maxlen) +{ + return ( string != NULL ) ? strnlen(string, maxlen) : 0; +} + ///////////////////////////////////////////////////////////////////// // StringBuf - dynamic string -- cgit v1.2.3-60-g2f50