Ticket #2996: 0005-Use-snprintf-insted-of-sprintf_s.patch

source/gui/IGUIObject.cpp

@@ -433 +433 @@
     // Generate a unique name
     static int x=0;
     char buf[64];
-    sprintf_s(buf, ARRAY_SIZE(buf), "__eventhandler%d (%s)", x++, Action.c_str());
+    snprintf(buf, ARRAY_SIZE(buf), "__eventhandler%d (%s)", x++, Action.c_str());
 
     JS::RootedFunction func(cx, JS_CompileFunction(cx, globalObj,
         buf, paramCount, paramNames, Code.c_str(), Code.length(), CodeName.c_str(), 0));

source/gui/scripting/ScriptFunctions.cpp

@@ -792 +792 @@
         UDate dateTime = g_L10n.ParseDateTime(__DATE__ " " __TIME__, "MMM d yyyy HH:mm:ss", Locale::getUS());
         std::string dateTimeString = g_L10n.LocalizeDateTime(dateTime, L10n::DateTime, SimpleDateFormat::DATE_TIME);
         char svnRevision[32];
-        sprintf_s(svnRevision, ARRAY_SIZE(svnRevision), "%ls", svn_revision);
+        snprintf(svnRevision, ARRAY_SIZE(svnRevision), "%ls", svn_revision);
         if (strcmp(svnRevision, "custom build") == 0)
         {
             // Translation: First item is a date and time, item between parenthesis is the Subversion revision number of the current build.
-            sprintf_s(buf, ARRAY_SIZE(buf), g_L10n.Translate("%s (custom build)").c_str(), dateTimeString.c_str());
+            snprintf(buf, ARRAY_SIZE(buf), g_L10n.Translate("%s (custom build)").c_str(), dateTimeString.c_str());
         }
         else
         {
             // Translation: First item is a date and time, item between parenthesis is the Subversion revision number of the current build.
-            sprintf_s(buf, ARRAY_SIZE(buf), g_L10n.Translate("%s (%ls)").c_str(), dateTimeString.c_str(), svn_revision);
+            snprintf(buf, ARRAY_SIZE(buf), g_L10n.Translate("%s (%ls)").c_str(), dateTimeString.c_str(), svn_revision);
         }
     }
     else if (mode == 0) // Date.
     {
         UDate dateTime = g_L10n.ParseDateTime(__DATE__, "MMM d yyyy", Locale::getUS());
         std::string dateTimeString = g_L10n.LocalizeDateTime(dateTime, L10n::Date, SimpleDateFormat::MEDIUM);
-        sprintf_s(buf, ARRAY_SIZE(buf), "%s", dateTimeString.c_str());
+        snprintf(buf, ARRAY_SIZE(buf), "%s", dateTimeString.c_str());
     }
     else if (mode == 1) // Time.
     {
         UDate dateTime = g_L10n.ParseDateTime(__TIME__, "HH:mm:ss", Locale::getUS());
         std::string dateTimeString = g_L10n.LocalizeDateTime(dateTime, L10n::Time, SimpleDateFormat::MEDIUM);
-        sprintf_s(buf, ARRAY_SIZE(buf), "%s", dateTimeString.c_str());
+        snprintf(buf, ARRAY_SIZE(buf), "%s", dateTimeString.c_str());
     }
     else if (mode == 2) // Revision.
     {
         char svnRevision[32];
-        sprintf_s(svnRevision, ARRAY_SIZE(svnRevision), "%ls", svn_revision);
+        snprintf(svnRevision, ARRAY_SIZE(svnRevision), "%ls", svn_revision);
         if (strcmp(svnRevision, "custom build") == 0)
         {
-            sprintf_s(buf, ARRAY_SIZE(buf), "%s", g_L10n.Translate("custom build").c_str());
+            snprintf(buf, ARRAY_SIZE(buf), "%s", g_L10n.Translate("custom build").c_str());
         }
         else
         {
-            sprintf_s(buf, ARRAY_SIZE(buf), "%ls", svn_revision);
+            snprintf(buf, ARRAY_SIZE(buf), "%ls", svn_revision);
         }
     }
 

source/network/NetServer.cpp

@@ -205 +205 @@
 {
     // Values we want to set.
     char psPort[6];
-    sprintf_s(psPort, ARRAY_SIZE(psPort), "%d", PS_DEFAULT_PORT);
+    snprintf(psPort, ARRAY_SIZE(psPort), "%d", PS_DEFAULT_PORT);
     const char* leaseDuration = "0"; // Indefinite/permanent lease duration.
     const char* description = "0AD Multiplayer";
     const char* protocall = "UDP";

source/ps/CLogger.cpp

@@ -116 +116 @@
 CLogger::~CLogger()
 {
     char buffer[128];
-    sprintf_s(buffer, ARRAY_SIZE(buffer), " with %d message(s), %d error(s) and %d warning(s).", m_NumberOfMessages,m_NumberOfErrors,m_NumberOfWarnings);
+    snprintf(buffer, ARRAY_SIZE(buffer), " with %d message(s), %d error(s) and %d warning(s).", m_NumberOfMessages,m_NumberOfErrors,m_NumberOfWarnings);
 
     time_t t = time(NULL);
     struct tm* now = localtime(&t);
     char currentDate[17];
-    sprintf_s(currentDate, ARRAY_SIZE(currentDate), "%04d-%02d-%02d", 1900+now->tm_year, 1+now->tm_mon, now->tm_mday);
+    snprintf(currentDate, ARRAY_SIZE(currentDate), "%04d-%02d-%02d", 1900+now->tm_year, 1+now->tm_mon, now->tm_mday);
     char currentTime[10];
-    sprintf_s(currentTime, ARRAY_SIZE(currentTime), "%02d:%02d:%02d", now->tm_hour, now->tm_min, now->tm_sec);
+    snprintf(currentTime, ARRAY_SIZE(currentTime), "%02d:%02d:%02d", now->tm_hour, now->tm_min, now->tm_sec);
 
     //Write closing text
 

source/ps/GUID.cpp

@@ -33 +33 @@
         u32 r = 0;
         sys_generate_random_bytes((u8*)&r, sizeof(r));
         char buf[32];
-        sprintf_s(buf, ARRAY_SIZE(buf), "%08X", r);
+        snprintf(buf, ARRAY_SIZE(buf), "%08X", r);
         guid += buf;
     }
 

source/ps/Profile.cpp

@@ -116 +116 @@
 CStr CProfileNodeTable::GetTitle()
 {
     char buf[512];
-    sprintf_s(buf, ARRAY_SIZE(buf), "Profiling Information for: %s (Time in node: %.3f msec/frame)", node->GetName(), node->GetFrameTime() * 1000.0f );
+    snprintf(buf, ARRAY_SIZE(buf), "Profiling Information for: %s (Time in node: %.3f msec/frame)", node->GetName(), node->GetFrameTime() * 1000.0f );
     return buf;
 }
 
@@ -186 +186 @@
         }
 
         if (col == 2)
-            sprintf_s(buf, ARRAY_SIZE(buf), "%.3f", unlogged_time_frame * 1000.0f);
+            snprintf(buf, ARRAY_SIZE(buf), "%.3f", unlogged_time_frame * 1000.0f);
         else if (col == 3)
-            sprintf_s(buf, ARRAY_SIZE(buf), "%.1f", unlogged_mallocs_frame);
+            snprintf(buf, ARRAY_SIZE(buf), "%.1f", unlogged_mallocs_frame);
         else if (col == 5)
-            sprintf_s(buf, ARRAY_SIZE(buf), "%.3f", unlogged_time_turn * 1000.f);
+            snprintf(buf, ARRAY_SIZE(buf), "%.3f", unlogged_time_turn * 1000.f);
         else if (col == 6)
-            sprintf_s(buf, ARRAY_SIZE(buf), "%.1f", unlogged_mallocs_turn);
+            snprintf(buf, ARRAY_SIZE(buf), "%.1f", unlogged_mallocs_turn);
         
         return CStr(buf);
     }
@@ -204 +204 @@
         return child->GetName();
         
     case 1:
-        sprintf_s(buf, ARRAY_SIZE(buf), "%.1f", child->GetFrameCalls());
+        snprintf(buf, ARRAY_SIZE(buf), "%.1f", child->GetFrameCalls());
         break;
     case 2:
-        sprintf_s(buf, ARRAY_SIZE(buf), "%.3f", child->GetFrameTime() * 1000.0f);
+        snprintf(buf, ARRAY_SIZE(buf), "%.3f", child->GetFrameTime() * 1000.0f);
         break;
     case 3:
-        sprintf_s(buf, ARRAY_SIZE(buf), "%.1f", child->GetFrameMallocs());
+        snprintf(buf, ARRAY_SIZE(buf), "%.1f", child->GetFrameMallocs());
         break;
     case 4:
-        sprintf_s(buf, ARRAY_SIZE(buf), "%.1f", child->GetTurnCalls());
+        snprintf(buf, ARRAY_SIZE(buf), "%.1f", child->GetTurnCalls());
         break;
     case 5:
-        sprintf_s(buf, ARRAY_SIZE(buf), "%.3f", child->GetTurnTime() * 1000.0f);
+        snprintf(buf, ARRAY_SIZE(buf), "%.3f", child->GetTurnTime() * 1000.0f);
         break;
     case 6:
-        sprintf_s(buf, ARRAY_SIZE(buf), "%.1f", child->GetTurnMallocs());
+        snprintf(buf, ARRAY_SIZE(buf), "%.1f", child->GetTurnMallocs());
         break;
     }
     return CStr(buf);

source/ps/UserReport.cpp

@@ -533 +533 @@
         for (size_t i = 0; i < ARRAY_SIZE(bytes); ++i)
         {
             char hex[3];
-            sprintf_s(hex, ARRAY_SIZE(hex), "%02x", (unsigned int)bytes[i]);
+            snprintf(hex, ARRAY_SIZE(hex), "%02x", (unsigned int)bytes[i]);
             userID += hex;
         }
 

source/ps/XML/XeroXMB.cpp

@@ -34 +34 @@
 {
     m_Pointer = FileData;
     char Header[5] = { 0 };
-    strncpy_s(Header, 5, m_Pointer, 4);
+    strncpy(Header, m_Pointer, 4);
     m_Pointer += 4;
     // (c.f. @return documentation of this function)
     if(!strcmp(Header, UnfinishedHeaderMagicStr))

source/renderer/Renderer.cpp

@@ -169 +169 @@
     case Row_DrawCalls:
         if (col == 0)
             return "# draw calls";
-        sprintf_s(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_DrawCalls);
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_DrawCalls);
         return buf;
 
     case Row_TerrainTris:
         if (col == 0)
             return "# terrain tris";
-        sprintf_s(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_TerrainTris);
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_TerrainTris);
         return buf;
 
     case Row_WaterTris:
         if (col == 0)
             return "# water tris";
-        sprintf_s(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_WaterTris);
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_WaterTris);
         return buf;
 
     case Row_ModelTris:
         if (col == 0)
             return "# model tris";
-        sprintf_s(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_ModelTris);
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_ModelTris);
         return buf;
 
     case Row_OverlayTris:
         if (col == 0)
             return "# overlay tris";
-        sprintf_s(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_OverlayTris);
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_OverlayTris);
         return buf;
 
     case Row_BlendSplats:
         if (col == 0)
             return "# blend splats";
-        sprintf_s(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_BlendSplats);
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_BlendSplats);
         return buf;
 
     case Row_Particles:
         if (col == 0)
             return "# particles";
-        sprintf_s(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_Particles);
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)Stats.m_Particles);
         return buf;
 
     case Row_VBReserved:
         if (col == 0)
             return "VB reserved";
-        sprintf_s(buf, sizeof(buf), "%lu kB", (unsigned long)g_VBMan.GetBytesReserved() / 1024);
+        snprintf(buf, sizeof(buf), "%lu kB", (unsigned long)g_VBMan.GetBytesReserved() / 1024);
         return buf;
 
     case Row_VBAllocated:
         if (col == 0)
             return "VB allocated";
-        sprintf_s(buf, sizeof(buf), "%lu kB", (unsigned long)g_VBMan.GetBytesAllocated() / 1024);
+        snprintf(buf, sizeof(buf), "%lu kB", (unsigned long)g_VBMan.GetBytesAllocated() / 1024);
         return buf;
 
     case Row_TextureMemory:
         if (col == 0)
             return "textures uploaded";
-        sprintf_s(buf, sizeof(buf), "%lu kB", (unsigned long)g_Renderer.GetTextureManager().GetBytesUploaded() / 1024);
+        snprintf(buf, sizeof(buf), "%lu kB", (unsigned long)g_Renderer.GetTextureManager().GetBytesUploaded() / 1024);
         return buf;
 
     case Row_ShadersLoaded:
         if (col == 0)
             return "shader effects loaded";
-        sprintf_s(buf, sizeof(buf), "%lu", (unsigned long)g_Renderer.GetShaderManager().GetNumEffectsLoaded());
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)g_Renderer.GetShaderManager().GetNumEffectsLoaded());
         return buf;
 
     default:

source/simulation2/serialization/DebugSerializer.cpp

@@ -161 +161 @@
     char buf[4];
     for (size_t i = 0; i < len; ++i)
     {
-        sprintf_s(buf, ARRAY_SIZE(buf), " %02x", (unsigned int)data[i]);
+        snprintf(buf, ARRAY_SIZE(buf), " %02x", (unsigned int)data[i]);
         m_Stream << buf;
     }
 

source/tools/atlas/GameInterface/MessagePasserImpl.cpp

@@ -36 +36 @@
     while (tries++ < 16) // some arbitrary cut-off point to avoid infinite loops
     {
         static char name[64];
-        sprintf_s(name, ARRAY_SIZE(name), "/wfg-atlas-msgpass-%d-%d",
+        snprintf(name, ARRAY_SIZE(name), "/wfg-atlas-msgpass-%d-%d",
                 (int)rand(1, 1000), (int)(time(0)%1000));
         sem_t* sem = sem_open(name, O_CREAT | O_EXCL, 0700, 0);