From 457266d249694a32f39ab621dca89534a3b7ae79 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Aug 2015 00:03:45 -0400 Subject: [PATCH] Make UTIL_Format wrap ke::SafeSprintf. --- core/sm_stringutil.cpp | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/core/sm_stringutil.cpp b/core/sm_stringutil.cpp index a3ec8c83..158ef0e0 100644 --- a/core/sm_stringutil.cpp +++ b/core/sm_stringutil.cpp @@ -1,5 +1,5 @@ /** - * vim: set ts=4 : + * vim: set ts=4 sw=4 tw=99 noet : * ============================================================================= * SourceMod * 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_start(ap, fmt); - size_t len = vsnprintf(buffer, maxlength, fmt, ap); + size_t len = ke::SafeVsprintf(buffer, maxlength, fmt, ap); va_end(ap); - - if (len >= maxlength) - { - buffer[maxlength - 1] = '\0'; - return (maxlength - 1); - } - else - { - return len; - } + return len; } size_t UTIL_FormatArgs(char *buffer, size_t maxlength, const char *fmt, va_list ap) { - size_t len = vsnprintf(buffer, maxlength, fmt, ap); - - if (len >= maxlength) - { - buffer[maxlength - 1] = '\0'; - return (maxlength - 1); - } - else - { - return len; - } + return ke::SafeVsprintf(buffer, maxlength, fmt, ap); } char *sm_strdup(const char *str)