From f7a58ec04dc76ae1417903b6f2884850792e330d Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 13 Apr 2018 20:14:20 +0300 Subject: [PATCH] Remove MSVC-specific try-except for C in Q_vsnprintf --- engine/common/crtlib.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/engine/common/crtlib.c b/engine/common/crtlib.c index e7a68cda..3e73020a 100644 --- a/engine/common/crtlib.c +++ b/engine/common/crtlib.c @@ -14,6 +14,7 @@ GNU General Public License for more details. */ #include +#include #include "common.h" void Q_strnupr( const char *in, char *out, size_t size_out ) @@ -561,23 +562,14 @@ int Q_vsnprintf( char *buffer, size_t buffersize, const char *format, va_list ar { size_t result; - __try - { - result = _vsnprintf( buffer, buffersize, format, args ); - } - - // to prevent crash while output - __except( EXCEPTION_EXECUTE_HANDLER ) - { - memset( buffer, 0, buffersize ); - result = -1; - } + result = vsnprintf( buffer, buffersize, format, args ); if( result < 0 || result >= buffersize ) { buffer[buffersize - 1] = '\0'; return -1; } + return result; } @@ -719,4 +711,4 @@ char *va( const char *format, ... ) va_end( argptr ); return s; -} \ No newline at end of file +}