Commit 8eff34ee authored by Andrey Kamaev's avatar Andrey Kamaev Committed by OpenCV Buildbot

Merge pull request #709 from taka-no-me:cv_format

parents 6e2708e0 2107ea97
...@@ -350,11 +350,23 @@ const String& getBuildInformation() ...@@ -350,11 +350,23 @@ const String& getBuildInformation()
String format( const char* fmt, ... ) String format( const char* fmt, ... )
{ {
char buf[1 << 16]; char buf[1024];
va_list args;
va_start( args, fmt ); va_list va;
vsprintf( buf, fmt, args ); va_start(va, fmt);
return String(buf); int len = vsnprintf(buf, sizeof(buf), fmt, va);
va_end(va);
if (len >= (int)sizeof(buf))
{
String s(len, '\0');
va_start(va, fmt);
len = vsnprintf((char*)s.c_str(), len + 1, fmt, va);
va_end(va);
return s;
}
return String(buf, len);
} }
String tempfile( const char* suffix ) String tempfile( const char* suffix )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment