Changeset 681

Timestamp:

Mar 3, 2013, 5:37:58 AM (12 years ago)

Author:

alloc

Message:

Daodan: Fixed MSVC deps

Location:

Daodan/src

Files:

• Daodan.c (modified) (1 diff)
• Daodan_BSL.c (modified) (1 diff)
• Daodan_Utility.c (modified) (1 diff)
• dSFMT (deleted)

Daodan/src/Daodan.c

@@ -556 +556 @@
         char v6[512]; // [sp+0h] [bp-100h]@1
         FILE* UUgError_WarningFile = *_UUgError_WarningFile;
-        sprintf_s(
-                v6, 512,
-                "Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
-                errornum,
-                filename,
-                linenumber,
-                message);
-
-        if ( UUgError_WarningFile 
-                || (UUgError_WarningFile = oni_fopen("debugger.txt", "wb"), UUgError_WarningFile ) )
-        { 
-                oni_fprintf(UUgError_WarningFile, "%s\r\n", v6);
-                oni_fflush(UUgError_WarningFile);
+
+        if (filename && message && (strlen(filename)+strlen(message))<420) {
+                sprintf(
+                        v6,
+                        "Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
+                        errornum,
+                        filename,
+                        linenumber,
+                        message);
+
+                if ( UUgError_WarningFile 
+                        || (UUgError_WarningFile = oni_fopen("debugger.txt", "wb"), UUgError_WarningFile ) )
+                { 
+                        oni_fprintf(UUgError_WarningFile, "%s\r\n", v6);
+                        oni_fflush(UUgError_WarningFile);
+                }
         }
         //oni_fprintf(stdout, v6);

Daodan/src/Daodan_BSL.c

@@ -864 +864 @@
         char argfmt2[512];
         uint16_t errornum;
-        sprintf_s(argfmt2, 512, "%s [|]", argfmt);
-        errornum = SLrScript_Command_Register_ReturnType(name, desc, argfmt2, type, callback);
-        if(errornum)
-        {
-                DDrStartupMessage("Registration of script command %s failed with error %i", name, errornum);
-        }
-
+        if (argfmt && strlen(argfmt) < 507) {
+                sprintf(argfmt2, "%s [|]", argfmt);
+                errornum = SLrScript_Command_Register_ReturnType(name, desc, argfmt2, type, callback);
+                if(errornum)
+                {
+                        DDrStartupMessage("Registration of script command %s failed with error %i", name, errornum);
+                }
+        } else {
+                DDrStartupMessage("Registration of script command %s failed because of a too long argfmt", name);
+        }
 }
 

Daodan/src/Daodan_Utility.c

@@ -160 +160 @@
                                         if(clipboardText && strlen(clipboardText) + charsUsed < 502)
                                         {
-                                                strcpy_s( cons->text_entries[0].text + charsUsed, 502 - charsUsed - 1, clipboardText);
+                                                strcpy_s( cons->text_entries[0].text + charsUsed, clipboardText);
                                                 lastPasteTime = ONgGameState->GameTime;
                                         }