TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix missing va_end's

Browse source
This commit is contained in:
Ben Payne 2015-02-10 18:08:55 -05:00
parent 0ffd7f5620
commit 591253d5b5
7 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/console/CMDscan.cpp
View file

@ -2190,6 +2190,7 @@ void CMDerror(char *format, ...)
#else #else
vsnprintf( tempBuf, BUFMAX, format, args ); vsnprintf( tempBuf, BUFMAX, format, args );
#endif #endif
va_end(args);
if(fileName) if(fileName)
{ {

1
Engine/source/console/CMDscan.l
View file

@ -250,6 +250,7 @@ void CMDerror(char *format, ...)
#else #else
vsnprintf( tempBuf, BUFMAX, format, args ); vsnprintf( tempBuf, BUFMAX, format, args );
#endif #endif
va_end(args);
if(fileName) if(fileName)
{ {

1
Engine/source/console/console.cpp
View file

@ -1162,6 +1162,7 @@ const char *evaluatef(const char* string, ...)
va_list args; va_list args;
va_start(args, string); va_start(args, string);
dVsprintf(buffer, sizeof(buffer), string, args); dVsprintf(buffer, sizeof(buffer), string, args);
va_end(args);
CodeBlock *newCodeBlock = new CodeBlock(); CodeBlock *newCodeBlock = new CodeBlock();
return newCodeBlock->compileExec(NULL, buffer, false, 0); return newCodeBlock->compileExec(NULL, buffer, false, 0);
} }

6
Engine/source/core/strings/stringFunctions.cpp
View file

@ -389,6 +389,7 @@ void dPrintf(const char *format, ...)
va_list args; va_list args;
va_start(args, format); va_start(args, format);
vprintf(format, args); vprintf(format, args);
va_end(args);
} }
S32 dVprintf(const char *format, va_list arglist) S32 dVprintf(const char *format, va_list arglist)
@ -402,6 +403,7 @@ S32 dSprintf(char *buffer, U32 bufferSize, const char *format, ...)
va_start(args, format); va_start(args, format);
S32 len = vsnprintf(buffer, bufferSize, format, args); S32 len = vsnprintf(buffer, bufferSize, format, args);
va_end(args);
AssertWarn( len < bufferSize, "Buffer too small in call to dSprintf!" ); AssertWarn( len < bufferSize, "Buffer too small in call to dSprintf!" );
@ -470,7 +472,9 @@ S32 dSscanf(const char *buffer, const char *format, ...)
#else #else
va_list args; va_list args;
va_start(args, format); va_start(args, format);
return vsscanf(buffer, format, args); int res = vsscanf(buffer, format, args);
va_end(args);
return res;
#endif #endif
} }

1
Engine/source/platform/platformAssert.cpp
View file

@ -179,6 +179,7 @@ const char* avar(const char *message, ...)
va_list args; va_list args;
va_start(args, message); va_start(args, message);
dVsprintf(buffer, sizeof(buffer), message, args); dVsprintf(buffer, sizeof(buffer), message, args);
va_end(args);
return( buffer ); return( buffer );
} }

2
Engine/source/platformMac/macCarbStrings.cpp
View file

@ -45,7 +45,7 @@ int dSprintf(char *buffer, dsize_t /*bufferSize*/, const char *format, ...)
va_list args; va_list args;
va_start(args, format); va_start(args, format);
S32 len = vsprintf(buffer, format, args); S32 len = vsprintf(buffer, format, args);
va_end(args);
return (len); return (len);
} }

1
Engine/source/platformX86UNIX/x86UNIXConsole.cpp
View file

@ -174,6 +174,7 @@ void StdConsole::printf(const char *s, ...)
va_list args; va_list args;
va_start(args, s); va_start(args, s);
vsnprintf(buffer, BufSize, s, args); vsnprintf(buffer, BufSize, s, args);
va_end(args);
// Replace tabs with carats, like the "real" console does. // Replace tabs with carats, like the "real" console does.
char *pos = buffer; char *pos = buffer;
while (*pos) { while (*pos) {