1 files changed, 35 insertions, 12 deletions

diff --git a/LibOVR/Src/Kernel/OVR_String_FormatUtil.cpp b/LibOVR/Src/Kernel/OVR_String_FormatUtil.cpp
index e196dd7..d52b6bb 100644
--- a/LibOVR/Src/Kernel/OVR_String_FormatUtil.cpp
+++ b/LibOVR/Src/Kernel/OVR_String_FormatUtil.cpp
@@ -5,16 +5,16 @@ Content     :   String format functions.
 Created     :   February 27, 2013
 Notes       : 
 
-Copyright   :   Copyright 2014 Oculus VR, Inc. All Rights reserved.
+Copyright   :   Copyright 2014 Oculus VR, LLC All Rights reserved.
 
-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); 
+Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License"); 
 you may not use the Oculus VR Rift SDK except in compliance with the License, 
 which is provided at the time of installation or download, or which 
 otherwise accompanies this software in either electronic or hard copy form.
 
 You may obtain a copy of the License at
 
-http://www.oculusvr.com/licenses/LICENSE-3.1 
+http://www.oculusvr.com/licenses/LICENSE-3.2 
 
 Unless required by applicable law or agreed to in writing, the Oculus VR SDK 
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,22 +32,45 @@ namespace OVR {
 void StringBuffer::AppendFormat(const char* format, ...)
 {       
     va_list argList;
+    char    buffer[512];
+    char*   bufferUsed = buffer;
+    char*   bufferAllocated = NULL;
 
     va_start(argList, format);
-    UPInt size = OVR_vscprintf(format, argList);
-    va_end(argList);
 
-    char* buffer = (char*) OVR_ALLOC(sizeof(char) * (size+1));
+    #if !defined(OVR_CC_MSVC) // Non-Microsoft compilers require you to save a copy of the va_list.
+        va_list argListSaved;
+        va_copy(argListSaved, argList);
+    #endif
+
+    int requiredStrlen = OVR_vsnprintf(bufferUsed, OVR_ARRAY_COUNT(buffer), format, argList); // The large majority of the time this will succeed.
+
+    if(requiredStrlen >= (int)sizeof(buffer)) // If the initial capacity wasn't enough...
+    {
+        bufferAllocated = (char*)OVR_ALLOC(sizeof(char) * (requiredStrlen + 1));
+        bufferUsed = bufferAllocated;
+        if(bufferAllocated)
+        {
+            #if !defined(OVR_CC_MSVC)
+                va_end(argList);
+                va_copy(argList, argListSaved);
+            #endif
+            requiredStrlen = OVR_vsnprintf(bufferAllocated, (requiredStrlen + 1), format, argList);
+        }
+    }
+
+    if(requiredStrlen < 0) // If there was a printf format error...
+    {
+        bufferUsed = NULL;
+    }
 
-    va_start(argList, format);
-    UPInt result = OVR_vsprintf(buffer, size+1, format, argList);
-    OVR_UNUSED1(result);
     va_end(argList);
-    OVR_ASSERT_LOG(result == size, ("Error in OVR_vsprintf"));
 
-    AppendString(buffer);
+    if(bufferUsed)
+        AppendString(bufferUsed);
 
-    OVR_FREE(buffer);
+    if(bufferAllocated)
+        OVR_FREE(bufferAllocated);
 }
 
 } // OVR