From c10d6dd38c9fff3ea0ec335465b7f632d5b086db Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 9 Aug 2007 11:02:44 +0000 Subject: The new functions now clear junk from the output buffer, this simplifies the code a bit. Added a TODO for one emblem loading problem/crash. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10969 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/mapindex.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/common') diff --git a/src/common/mapindex.c b/src/common/mapindex.c index 7e55daff8..a7f7aca5a 100644 --- a/src/common/mapindex.c +++ b/src/common/mapindex.c @@ -39,7 +39,8 @@ const char* mapindex_getmapname(const char* string, char* output) len -= 4; // strip .gat extension len = min(len, MAP_NAME_LENGTH-1); - safestrncpy(dest, string, len+1); + strncpy(dest, string, len+1); + memset(&dest[len], '\0', MAP_NAME_LENGTH-len); return dest; } @@ -57,12 +58,14 @@ const char* mapindex_getmapname_ext(const char* string, char* output) len--; } - safestrncpy(dest, string, len+1); + strncpy(dest, string, len+1); if (len < 4 || stricmp(&dest[len-4], ".gat") != 0) { strcpy(&dest[len], ".gat"); len += 4; // add .gat extension } + + memset(&dest[len], '\0', MAP_NAME_LENGTH_EXT-len); return dest; } -- cgit v1.2.3-70-g09d2