r442 - trunk

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Jan 20 03:53:39 EST 2008


Author: icculus
Date: 2008-01-20 03:53:39 -0500 (Sun, 20 Jan 2008)
New Revision: 442

Modified:
   trunk/lua_glue.c
Log:
Made MojoLua_runFile() not use static filename buffers.


Modified: trunk/lua_glue.c
===================================================================
--- trunk/lua_glue.c	2008-01-20 08:49:53 UTC (rev 441)
+++ trunk/lua_glue.c	2008-01-20 08:53:39 UTC (rev 442)
@@ -381,17 +381,11 @@
     MojoArchive *ar = GBaseArchive;   // in case we want to generalize later.
     const MojoArchiveEntry *entinfo;
     boolean retval = false;
-    char clua[128];  // compiled filename.
-    char ulua[128];  // uncompiled filename.
+    char *clua = format("scripts/%0.luac", name);  // compiled filename.
+    char *ulua = format("scripts/%0.lua", name);   // uncompiled filename.
     int rc = 0;
     MojoInput *io = NULL;
 
-    if (snprintf(clua, sizeof(clua), "scripts/%s.luac", name) >= sizeof (clua))
-        return false;
-
-    if (snprintf(ulua, sizeof(ulua), "scripts/%s.lua", name) >= sizeof (ulua))
-        return false;
-
     if (ar->enumerate(ar))
     {
         while ((io == NULL) && ((entinfo = ar->enumNext(ar)) != NULL))
@@ -412,6 +406,9 @@
         } // while
     } // if
 
+    free(ulua);
+    free(clua);
+
     if (io != NULL)
     {
         char *realfname = (char *) xmalloc(strlen(entinfo->filename) + 2);




More information about the mojosetup-commits mailing list