No overflows due to too long program names.

zpleefly · May 17, 2018 · 7cac3dd · 7cac3dd
1 parent 7118543
commit 7cac3dd
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Processor/Machine.cpp b/Processor/Machine.cpp
@@ -78,10 +78,10 @@ Machine::Machine(int my_number, Names& playerNames,
        exit(1);
      }
 
-  sprintf(filename, "Programs/Schedules/%s.sch",progname.c_str());
-  cerr << "Opening file " << filename << endl;
-  inpf.open(filename);
-  if (inpf.fail()) { throw file_error("Missing '" + string(filename) + "'. Did you compile '" + progname + "'?"); }
+  string fname = "Programs/Schedules/" + progname + ".sch";
+  cerr << "Opening file " << fname << endl;
+  inpf.open(fname);
+  if (inpf.fail()) { throw file_error("Missing '" + fname + "'. Did you compile '" + progname + "'?"); }
 
   int nprogs;
   inpf >> nthreads;
@@ -95,10 +95,10 @@ Machine::Machine(int my_number, Names& playerNames,
 
   // Load in the programs 
   progs.resize(nprogs,N.num_players());
-  char threadname[1024];
+  string threadname;
   for (int i=0; i<nprogs; i++)
     { inpf >> threadname;
-      sprintf(filename,"Programs/Bytecode/%s.bc",threadname);
+      string filename = "Programs/Bytecode/" + threadname + ".bc";
       cerr << "Loading program " << i << " from " << filename << endl;
       ifstream pinp(filename);
       if (pinp.fail()) { throw file_error(filename); }