UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make UTIL_Format wrap ke::SafeSprintf.

Browse Source
This commit is contained in:
David Anderson 2015-08-26 00:03:45 -04:00
parent 9ba1363d86
commit 457266d249
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/sm_stringutil.cpp
View File

@ -1,5 +1,5 @@
/** /**
* vim: set ts=4 : * vim: set ts=4 sw=4 tw=99 noet :
* ============================================================================= * =============================================================================
* SourceMod * SourceMod
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
@ -1299,33 +1299,14 @@ size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...)
{ {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
size_t len = vsnprintf(buffer, maxlength, fmt, ap); size_t len = ke::SafeVsprintf(buffer, maxlength, fmt, ap);
va_end(ap); va_end(ap);
return len;
if (len >= maxlength)
{
buffer[maxlength - 1] = '\0';
return (maxlength - 1);
}
else
{
return len;
}
} }
size_t UTIL_FormatArgs(char *buffer, size_t maxlength, const char *fmt, va_list ap) size_t UTIL_FormatArgs(char *buffer, size_t maxlength, const char *fmt, va_list ap)
{ {
size_t len = vsnprintf(buffer, maxlength, fmt, ap); return ke::SafeVsprintf(buffer, maxlength, fmt, ap);
if (len >= maxlength)
{
buffer[maxlength - 1] = '\0';
return (maxlength - 1);
}
else
{
return len;
}
} }
char *sm_strdup(const char *str) char *sm_strdup(const char *str)