Make dgl_format_str reentrant by changing the static return buffer to auto

and returning a dynamically allocated copy.

diff --git a/dgamelaunch.c b/dgamelaunch.c
index a5b36af326b85e161d1b338ad2cee2559fa7ab14..f3c83ced419cc4f6c01ae0b43cd1d63a99b6d69a 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -284,7 +284,7 @@ gen_ttyrec_filename ()
 char*
 gen_inprogress_lock (int game, pid_t pid, char* ttyrec_filename)
 {
-  char *lockfile = NULL, filebuf[80];
+  char *lockfile = NULL, *inprogdir = NULL, filebuf[80];
   int fd;
   size_t len, wrlen;
   struct flock fl = { 0 };
@@ -299,11 +299,12 @@ gen_inprogress_lock (int game, pid_t pid, char* ttyrec_filename)
   fl.l_start = 0;
   fl.l_len = 0;
 
-  len = strlen(dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL)) + strlen(me->username) + strlen(ttyrec_filename) + 13;
+  len = strlen(inprogdir = dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL)) + strlen(me->username) + strlen(ttyrec_filename) + 13;
   lockfile = calloc(len, sizeof(char));
 
-  snprintf (lockfile, len, "%s%s:%s", dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL),
+  snprintf (lockfile, len, "%s%s:%s", inprogdir,
             me->username, ttyrec_filename);
+  free(inprogdir);
 
   fd = open (lockfile, O_WRONLY | O_CREAT, 0644);
   if (fcntl (fd, F_SETLKW, &fl) == -1) {
@@ -1332,7 +1333,7 @@ watchgame:
                   dgl_exec_cmdqueue_w(myconfig[gnum]->watchcmdqueue, gnum, me, chosen_name);
                   /* fix the variables in the arguments */
                   for (i = 0; i < myconfig[gnum]->num_wargs; i++) {
-                      wargs[i] = strdup(dgl_format_str(gnum, me, myconfig[gnum]->watch_args[i], chosen_name));
+                      wargs[i] = dgl_format_str(gnum, me, myconfig[gnum]->watch_args[i], chosen_name);
                   }
                   wargs[myconfig[gnum]->num_wargs] = NULL;
                   /* tidy up signals before launching external process */
@@ -2741,7 +2742,7 @@ purge_stale_locks (int game)
   size_t len;
   short firsttime = 1;
 
-  dir = strdup(dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL));
+  dir = dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL);
 
   if (!(pdir = opendir (dir))) {
       debug_write("purge_stale_locks dir open failed");
@@ -2753,7 +2754,7 @@ purge_stale_locks (int game)
   while ((dent = readdir (pdir)) != NULL)
     {
       FILE *ipfile;
-      char *colon, *fn;
+      char *colon, *fn, *inprogdir = NULL;
       char buf[16];
       pid_t pid;
       size_t len;
@@ -2773,10 +2774,11 @@ purge_stale_locks (int game)
       if (strncmp (dent->d_name, me->username, colon - dent->d_name))
         continue;
 
-      len = strlen (dent->d_name) + strlen(dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL)) + 1;
+      len = strlen (dent->d_name) + strlen(inprogdir = dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL)) + 1;
       fn = malloc (len);
 
-      snprintf (fn, len, "%s%s", dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL), dent->d_name);
+      snprintf (fn, len, "%s%s", inprogdir, dent->d_name);
+      free(inprogdir);
 
       if (!(ipfile = fopen (fn, "r"))) {
          debug_write("purge_stale_locks fopen inprogressdir fail");

diff --git a/dgl-common.c b/dgl-common.c
index 53f76a91bba74128d54997858e6fa2813022052e..b0a6cb8fd9c9029f35e4a220c676e62c99d5fe16 100644 (file)
--- a/dgl-common.c
+++ b/dgl-common.c
@@ -126,7 +126,7 @@ dgl_find_menu(char *menuname)
 char *
 dgl_format_str(int game, struct dg_user *me, char *str, char *plrname)
 {
-    static char buf[1024];
+    char buf[1024];
     char *f, *p, *end, *varname = NULL, *fallback = NULL;
     int ispercent = 0;
     int isbackslash = 0;
@@ -266,7 +266,7 @@ dgl_format_str(int game, struct dg_user *me, char *str, char *plrname)
     }
     *p = '\0';
 
-    return buf;
+    return strdup(buf);
 }
 
 int
@@ -280,16 +280,11 @@ dgl_exec_cmdqueue_w(struct dg_cmdpart *queue, int game, struct dg_user *me, char
 
     if (!queue) return 1;
 
-    p1 = (char *)malloc(1024);
-    p2 = (char *)malloc(1024);
-
-    if (!p1 || !p2) return 1;
-
     return_from_submenu = 0;
 
     while (tmp && !return_from_submenu) {
-       if (tmp->param1) strcpy(p1, dgl_format_str(game, me, tmp->param1, playername));
-       if (tmp->param2) strcpy(p2, dgl_format_str(game, me, tmp->param2, playername));
+       if (tmp->param1) p1 = dgl_format_str(game, me, tmp->param1, playername);
+       if (tmp->param2) p2 = dgl_format_str(game, me, tmp->param2, playername);
 
        switch (tmp->cmd) {
        default: break;
@@ -382,7 +377,7 @@ dgl_exec_cmdqueue_w(struct dg_cmdpart *queue, int game, struct dg_user *me, char
         case DGLCMD_SETPREFPATH:
             if (loggedin && p1) {
                 free(userpref_path);
-                userpref_path = strdup(dgl_format_str(-1, me, p1, playername));
+                userpref_path = dgl_format_str(-1, me, p1, playername);
             }
             break;
         case DGLCMD_SETPREF:
@@ -438,9 +433,12 @@ dgl_exec_cmdqueue_w(struct dg_cmdpart *queue, int game, struct dg_user *me, char
                for (userchoice = 0; userchoice < num_games; userchoice++) {
                    if (!strcmp(myconfig[userchoice]->game_id, p1) || !strcmp(myconfig[userchoice]->game_name, p1) || !strcmp(myconfig[userchoice]->shortname, p1)) {
                        if (purge_stale_locks(userchoice)) {
+                            char *ttrecdir = NULL
                            if (myconfig[userchoice]->rcfile) {
-                               if (access (dgl_format_str(userchoice, me, myconfig[userchoice]->rc_fmt, NULL), R_OK) == -1)
-                                   write_canned_rcfile (userchoice, dgl_format_str(userchoice, me, myconfig[userchoice]->rc_fmt, NULL));
+                                char *rcname = NULL;
+                               if (access (rcname = dgl_format_str(userchoice, me, myconfig[userchoice]->rc_fmt, NULL), R_OK) == -1)
+                                   write_canned_rcfile (userchoice, rcname);
+                                if (rcname) free(rcname);
                            }
 
                            setproctitle("%s [playing %s]", me->username, myconfig[userchoice]->shortname);
@@ -456,7 +454,7 @@ dgl_exec_cmdqueue_w(struct dg_cmdpart *queue, int game, struct dg_user *me, char
 
                            /* fix the variables in the arguments */
                            for (i = 0; i < myconfig[userchoice]->num_args; i++) {
-                               tmpstr = strdup(dgl_format_str(userchoice, me, myconfig[userchoice]->bin_args[i], NULL));
+                               tmpstr = dgl_format_str(userchoice, me, myconfig[userchoice]->bin_args[i], NULL);
                                free(myconfig[userchoice]->bin_args[i]);
                                myconfig[userchoice]->bin_args[i] = tmpstr;
                            }
@@ -468,10 +466,11 @@ dgl_exec_cmdqueue_w(struct dg_cmdpart *queue, int game, struct dg_user *me, char
                            idle_alarm_set_enabled(0);
                            /* launch program */
                            ttyrec_main (userchoice, me->username,
-                                        dgl_format_str(userchoice, me, myconfig[userchoice]->ttyrecdir, NULL),
+                                        ttrecdir = dgl_format_str(userchoice, me, myconfig[userchoice]->ttyrecdir, NULL),
                                         gen_ttyrec_filename());
                            idle_alarm_set_enabled(1);
                            played = 1;
+                            if (ttrecdir) free(ttrecdir);
                            /* lastly, run the generic "do these when a game is left" commands */
                            signal (SIGHUP, catch_sighup);
                            signal (SIGINT, catch_sighup);
@@ -494,11 +493,9 @@ dgl_exec_cmdqueue_w(struct dg_cmdpart *queue, int game, struct dg_user *me, char
            break;
        }
        tmp = tmp->next;
+        if (p1) free(p1);
+        if (p2) free(p2);
     }
-
-    free(p1);
-    free(p2);
-
     return 0;
 }
 
@@ -714,13 +711,14 @@ populate_games (int xgame, int *l, struct dg_user *me)
 
   for (game = ((xgame < 0) ? 0 : xgame); game < ((xgame <= 0) ? num_games : (xgame+1)); game++) {
 
-      dir = strdup(dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL));
+      dir = dgl_format_str(game, me, myconfig[game]->inprogressdir, NULL);
       if (!dir) continue;
 
       if (!(pdir = opendir (dir))) {
          debug_write("cannot open inprogress-dir");
          graceful_exit (140);
       }
+      free(dir);
 
    while ((pdirent = readdir (pdir)))
     {
@@ -733,6 +731,7 @@ populate_games (int xgame, int *l, struct dg_user *me)
       if (!inprog) continue;
 
       snprintf (fullname, 130, "%s%s", inprog, pdirent->d_name);
+      free(inprog);
 
       fd = 0;
       /* O_RDWR here should be O_RDONLY, but we need to test for
@@ -756,6 +755,7 @@ populate_games (int xgame, int *l, struct dg_user *me)
              ttrecdir = dgl_format_str(game, NULL, myconfig[game]->ttyrecdir, playername);
              if (!ttrecdir) continue;
               snprintf (ttyrecname, 130, "%s%s", ttrecdir, replacestr);
+              free(ttrecdir);
 
           if (!stat (ttyrecname, &pstat))
             {
@@ -820,6 +820,7 @@ populate_games (int xgame, int *l, struct dg_user *me)
                                      myconfig[game]->extra_info_file,
                                      games[len]->name);
                   game_read_extra_info(games[len], extra_info_file);
+                  free(extra_info_file);
               }
 
              len++;