Merge branch 'try-atoi'

swesterfeld · swesterfeld · commit 56765d979942 · 2025-08-20T16:34:24.000+02:00
* try-atoi: LIB: sm_try_atoi: always initialize output integer, just in case TOOLS: use sm_try_atoi for midi note command line arguments SRC: smtool: check results of str->int conversions SRC: smplay: check results of str->int conversions SRC: smplay: do not fail with error if libao support is available SRC: smenc: check results of str->int conversions See #31: Providing an (invalid?) MIDI note (e.g., -m e) causes smenc to hang indefinitely without error messages. LIB: provide sm_try_atoi function for str->int conversion with validation Signed-off-by: Stefan Westerfeld <stefan@space.twc.de>
diff --git a/lib/smutils.cc b/lib/smutils.cc
@@ -6,6 +6,7 @@
 #include <string>
 #include <locale>
 #include <codecvt>
+#include <charconv>
 
 #include <assert.h>
 #include <stdarg.h>
@@ -574,6 +575,21 @@ dir_exists (const string& dirname)
   return false;
 }
 
+bool
+sm_try_atoi (const char *str, int& i)
+{
+  i = 0;
+
+  if (!str || *str == '\0')
+    return false;
+
+  auto [ptr, ec] = std::from_chars (str, str + strlen (str), i);
+  if (ec != std::errc() || *ptr != '\0')
+    return false;
+
+  return true;
+}
+
 double
 sm_atof (const char *str)  // always use . as decimal seperator
 {
diff --git a/lib/smutils.hh b/lib/smutils.hh
@@ -200,6 +200,7 @@ Error read_dir (const std::string& dirname, std::vector<std::string>& files);
 bool file_exists (const std::string& filename);
 bool dir_exists (const std::string& dirname);
 
+bool sm_try_atoi (const char *str, int& i);
 double sm_atof (const char *str);  // always use . as decimal seperator
 double sm_atof_any (const char *str);  // allow . or locale as decimal separator
 
diff --git a/src/smenc.cc b/src/smenc.cc
@@ -149,7 +149,13 @@ Options::parse (int   *argc_p,
         }
       else if (check_arg (argc, argv, &i, "-m", &opt_arg))
         {
-          fundamental_freq = freqFromNote (atoi (opt_arg));
+          int note;
+          if (!sm_try_atoi (opt_arg, note) || note < 0 || note > 127)
+            {
+              fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
+          fundamental_freq = freqFromNote (note);
           fundamental_args++;
         }
       else if (check_arg (argc, argv, &i, "-M"))
@@ -176,7 +182,11 @@ Options::parse (int   *argc_p,
         }
       else if (check_arg (argc, argv, &i, "-O", &opt_arg))
         {
-          optimization_level = atoi (opt_arg);
+          if (!sm_try_atoi (opt_arg, optimization_level) || optimization_level < 0 || optimization_level > 2)
+            {
+              fprintf (stderr, "%s: invalid optimization level '%s', should be integer between 0 and 2\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
         }
       else if (check_arg (argc, argv, &i, "-s"))
         {
@@ -226,7 +236,11 @@ Options::parse (int   *argc_p,
       else if (check_arg (argc, argv, &i, "--text-input-file", &opt_arg))
         {
           text_input_file = true;
-          text_input_rate = atoi (opt_arg);
+          if (!sm_try_atoi (opt_arg, text_input_rate) || text_input_rate < 8000)
+            {
+              fprintf (stderr, "%s: invalid rate '%s', should be integer >= 8000\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
         }
       else if (check_arg (argc, argv, &i, "--config", &opt_arg))
         {
diff --git a/src/smplay.cc b/src/smplay.cc
@@ -82,19 +82,31 @@ Options::parse (int   *argc_p,
 	}
       else if (check_arg (argc, argv, &i, "--rate", &opt_arg) || check_arg (argc, argv, &i, "-r", &opt_arg))
 	{
-	  rate = atoi (opt_arg);
+          if (!sm_try_atoi (opt_arg, rate) || rate < 8000)
+            {
+              fprintf (stderr, "%s: invalid rate '%s', should be integer >= 8000\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
 	}
       else if (check_arg (argc, argv, &i, "--bits", &opt_arg))
         {
-          bits = atoi (opt_arg);
+          if (!sm_try_atoi (opt_arg, bits) || bits < 8)
+            {
+              fprintf (stderr, "%s: invalid bit depth '%s', should be integer >= 8\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
         }
       else if (check_arg (argc, argv, &i, "--export", &opt_arg) || check_arg (argc, argv, &i, "-x", &opt_arg))
         {
           export_wav = opt_arg;
         }
       else if (check_arg (argc, argv, &i, "--midi-note", &opt_arg) || check_arg (argc, argv, &i, "-m", &opt_arg))
         {
-          midi_note = atoi (opt_arg);
+          if (!sm_try_atoi (opt_arg, midi_note) || midi_note < 0 || midi_note > 127)
+            {
+              fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
         }
       else if (check_arg (argc, argv, &i, "--gain", &opt_arg) || check_arg (argc, argv, &i, "-g", &opt_arg))
         {
@@ -422,9 +434,10 @@ main (int argc, char **argv)
           pos += todo;
         }
       ao_close (play_device);
-#endif
+#else
       fprintf (stderr, "error: %s was compiled without libao support (use --export <filename>)\n", options.program_name.c_str());
       exit (1);
+#endif
     }
   else /* export wav */
     {
diff --git a/src/smtool.cc b/src/smtool.cc
@@ -474,7 +474,11 @@ class NoiseParamsCommand : public Command
   {
     if (args.size() == 1)
       {
-        frame = atoi (args[0].c_str());
+        if (!sm_try_atoi (args[0].c_str(), frame) || frame < 0)
+          {
+            fprintf (stderr, "invalid frame number '%s'\n", args[0].c_str());
+            return false;
+          }
         return true;
       }
     return false;
@@ -505,7 +509,11 @@ class FrameCommand : public Command
   {
     if (args.size() == 1)
       {
-        frame = atoi (args[0].c_str());
+        if (!sm_try_atoi (args[0].c_str(), frame) || frame < 0)
+          {
+            fprintf (stderr, "invalid frame number '%s'\n", args[0].c_str());
+            return false;
+          }
         return true;
       }
     return false;
@@ -543,7 +551,11 @@ class FrameParamsCommand : public Command
   {
     if (args.size() == 1)
       {
-        frame = atoi (args[0].c_str());
+        if (!sm_try_atoi (args[0].c_str(), frame) || frame < 0)
+          {
+            fprintf (stderr, "invalid frame number '%s'\n", args[0].c_str());
+            return false;
+          }
         return true;
       }
     return false;
@@ -711,7 +723,11 @@ class SpectrumCommand : public Command
   {
     if (args.size() == 1)
       {
-        frame = atoi (args[0].c_str());
+        if (!sm_try_atoi (args[0].c_str(), frame) || frame < 0)
+          {
+            fprintf (stderr, "invalid frame number '%s'\n", args[0].c_str());
+            return false;
+          }
         return true;
       }
     return false;
@@ -902,8 +918,11 @@ class TuneAllFramesCommand : public Command
   {
     if (args.size() == 1)
       {
-        fundamental_est_n = atoi (args[0].c_str());
-        assert (fundamental_est_n >= 1 && fundamental_est_n <= 3);
+        if (!sm_try_atoi (args[0].c_str(), fundamental_est_n) || fundamental_est_n < 1 || fundamental_est_n > 3)
+          {
+            fprintf (stderr, "invalid number of partials '%s', should be integer between 1 and 3\n", args[0].c_str());
+            return false;
+          }
         return true;
       }
     return false;
@@ -994,8 +1013,11 @@ class SmoothTuneCommand : public Command
   {
     if (args.size() == 3)
       {
-        fundamental_est_n = atoi (args[0].c_str());
-        assert (fundamental_est_n >= 1 && fundamental_est_n <= 3);
+        if (!sm_try_atoi (args[0].c_str(), fundamental_est_n) || fundamental_est_n < 1 || fundamental_est_n > 3)
+          {
+            fprintf (stderr, "invalid number of partials '%s', should be integer between 1 and 3\n", args[0].c_str());
+            return false;
+          }
         smooth_ms = sm_atof (args[1].c_str());
         assert (smooth_ms > 10 && smooth_ms < 5000);
         smooth_percent = sm_atof (args[2].c_str());
@@ -1194,7 +1216,11 @@ class ExtractSMCommand : public Command
   {
     if (args.size() == 2)
       {
-        note = atoi (args[0].c_str());
+        if (!sm_try_atoi (args[0].c_str(), note) || note < 0 || note > 127)
+          {
+            fprintf (stderr, "invalid note '%s', should be integer between 0 and 127\n", args[0].c_str());
+            return false;
+          }
         filename = args[1];
         return true;
       }
diff --git a/tools/smlive.cc b/tools/smlive.cc
@@ -121,7 +121,13 @@ Options::parse (int   *argc_p,
         }
       else if (check_arg (argc, argv, &i, "--midi-note", &opt_arg) || check_arg (argc, argv, &i, "-m", &opt_arg))
         {
-          freq = freq_from_note (atoi (opt_arg));
+          int note;
+          if (!sm_try_atoi (opt_arg, note) || note < 0 || note > 127)
+            {
+              fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
+          freq = freq_from_note (note);
         }
       else if (check_arg (argc, argv, &i, "--gain", &opt_arg) || check_arg (argc, argv, &i, "-g", &opt_arg))
         {
diff --git a/tools/smrunplan.cc b/tools/smrunplan.cc
@@ -89,7 +89,11 @@ Options::parse (int   *argc_p,
 	}
       else if (check_arg (argc, argv, &i, "--midi-note", &opt_arg) || check_arg (argc, argv, &i, "-m", &opt_arg))
         {
-          midi_note = atoi (opt_arg);
+          if (!sm_try_atoi (opt_arg, midi_note) || midi_note < 0 || midi_note > 127)
+            {
+              fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
         }
       else if (check_arg (argc, argv, &i, "--len", &opt_arg) || check_arg (argc, argv, &i, "-l", &opt_arg))
         {
diff --git a/tools/smsfimport.cc b/tools/smsfimport.cc
@@ -43,6 +43,7 @@ using SpectMorph::Main;
 
 using SpectMorph::string_printf;
 using SpectMorph::sm_round_positive;
+using SpectMorph::sm_try_atoi;
 
 using std::string;
 using std::vector;
@@ -567,7 +568,11 @@ Options::parse (int   *argc_p,
 	}
       else if (check_arg (argc, argv, &i, "-m", &opt_arg))
         {
-          midi_note = atoi (opt_arg);
+          if (!sm_try_atoi (opt_arg, midi_note) || midi_note < 0 || midi_note > 127)
+            {
+              fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);
+              exit (1);
+            }
         }
       else if (check_arg (argc, argv, &i, "-j", &opt_arg))
         {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,13 @@ Options::parse (int *argc_p,`
`149`	`149`	`}`
`150`	`150`	`else if (check_arg (argc, argv, &i, "-m", &opt_arg))`
`151`	`151`	`{`
`152`		`- fundamental_freq = freqFromNote (atoi (opt_arg));`
	`152`	`+ int note;`
	`153`	`+ if (!sm_try_atoi (opt_arg, note) \|\| note < 0 \|\| note > 127)`
	`154`	`+ {`
	`155`	`+ fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);`
	`156`	`+ exit (1);`
	`157`	`+ }`
	`158`	`+ fundamental_freq = freqFromNote (note);`
`153`	`159`	`fundamental_args++;`
`154`	`160`	`}`
`155`	`161`	`else if (check_arg (argc, argv, &i, "-M"))`
`@@ -176,7 +182,11 @@ Options::parse (int *argc_p,`
`176`	`182`	`}`
`177`	`183`	`else if (check_arg (argc, argv, &i, "-O", &opt_arg))`
`178`	`184`	`{`
`179`		`- optimization_level = atoi (opt_arg);`
	`185`	`+ if (!sm_try_atoi (opt_arg, optimization_level) \|\| optimization_level < 0 \|\| optimization_level > 2)`
	`186`	`+ {`
	`187`	`+ fprintf (stderr, "%s: invalid optimization level '%s', should be integer between 0 and 2\n", options.program_name.c_str(), opt_arg);`
	`188`	`+ exit (1);`
	`189`	`+ }`
`180`	`190`	`}`
`181`	`191`	`else if (check_arg (argc, argv, &i, "-s"))`
`182`	`192`	`{`
`@@ -226,7 +236,11 @@ Options::parse (int *argc_p,`
`226`	`236`	`else if (check_arg (argc, argv, &i, "--text-input-file", &opt_arg))`
`227`	`237`	`{`
`228`	`238`	`text_input_file = true;`
`229`		`- text_input_rate = atoi (opt_arg);`
	`239`	`+ if (!sm_try_atoi (opt_arg, text_input_rate) \|\| text_input_rate < 8000)`
	`240`	`+ {`
	`241`	`+ fprintf (stderr, "%s: invalid rate '%s', should be integer >= 8000\n", options.program_name.c_str(), opt_arg);`
	`242`	`+ exit (1);`
	`243`	`+ }`
`230`	`244`	`}`
`231`	`245`	`else if (check_arg (argc, argv, &i, "--config", &opt_arg))`
`232`	`246`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,19 +82,31 @@ Options::parse (int *argc_p,`
`82`	`82`	`}`
`83`	`83`	`else if (check_arg (argc, argv, &i, "--rate", &opt_arg) \|\| check_arg (argc, argv, &i, "-r", &opt_arg))`
`84`	`84`	`{`
`85`		`- rate = atoi (opt_arg);`
	`85`	`+ if (!sm_try_atoi (opt_arg, rate) \|\| rate < 8000)`
	`86`	`+ {`
	`87`	`+ fprintf (stderr, "%s: invalid rate '%s', should be integer >= 8000\n", options.program_name.c_str(), opt_arg);`
	`88`	`+ exit (1);`
	`89`	`+ }`
`86`	`90`	`}`
`87`	`91`	`else if (check_arg (argc, argv, &i, "--bits", &opt_arg))`
`88`	`92`	`{`
`89`		`- bits = atoi (opt_arg);`
	`93`	`+ if (!sm_try_atoi (opt_arg, bits) \|\| bits < 8)`
	`94`	`+ {`
	`95`	`+ fprintf (stderr, "%s: invalid bit depth '%s', should be integer >= 8\n", options.program_name.c_str(), opt_arg);`
	`96`	`+ exit (1);`
	`97`	`+ }`
`90`	`98`	`}`
`91`	`99`	`else if (check_arg (argc, argv, &i, "--export", &opt_arg) \|\| check_arg (argc, argv, &i, "-x", &opt_arg))`
`92`	`100`	`{`
`93`	`101`	`export_wav = opt_arg;`
`94`	`102`	`}`
`95`	`103`	`else if (check_arg (argc, argv, &i, "--midi-note", &opt_arg) \|\| check_arg (argc, argv, &i, "-m", &opt_arg))`
`96`	`104`	`{`
`97`		`- midi_note = atoi (opt_arg);`
	`105`	`+ if (!sm_try_atoi (opt_arg, midi_note) \|\| midi_note < 0 \|\| midi_note > 127)`
	`106`	`+ {`
	`107`	`+ fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);`
	`108`	`+ exit (1);`
	`109`	`+ }`
`98`	`110`	`}`
`99`	`111`	`else if (check_arg (argc, argv, &i, "--gain", &opt_arg) \|\| check_arg (argc, argv, &i, "-g", &opt_arg))`
`100`	`112`	`{`
`@@ -422,9 +434,10 @@ main (int argc, char **argv)`
`422`	`434`	`pos += todo;`
`423`	`435`	`}`
`424`	`436`	`ao_close (play_device);`
`425`		`-#endif`
	`437`	`+#else`
`426`	`438`	`fprintf (stderr, "error: %s was compiled without libao support (use --export <filename>)\n", options.program_name.c_str());`
`427`	`439`	`exit (1);`
	`440`	`+#endif`
`428`	`441`	`}`
`429`	`442`	`else /* export wav */`
`430`	`443`	`{`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,11 @@ class NoiseParamsCommand : public Command`
`474`	`474`	`{`
`475`	`475`	`if (args.size() == 1)`
`476`	`476`	`{`
`477`		`- frame = atoi (args[0].c_str());`
	`477`	`+ if (!sm_try_atoi (args[0].c_str(), frame) \|\| frame < 0)`
	`478`	`+ {`
	`479`	`+ fprintf (stderr, "invalid frame number '%s'\n", args[0].c_str());`
	`480`	`+ return false;`
	`481`	`+ }`
`478`	`482`	`return true;`
`479`	`483`	`}`
`480`	`484`	`return false;`
`@@ -505,7 +509,11 @@ class FrameCommand : public Command`
`505`	`509`	`{`
`506`	`510`	`if (args.size() == 1)`
`507`	`511`	`{`
`508`		`- frame = atoi (args[0].c_str());`
	`512`	`+ if (!sm_try_atoi (args[0].c_str(), frame) \|\| frame < 0)`
	`513`	`+ {`
	`514`	`+ fprintf (stderr, "invalid frame number '%s'\n", args[0].c_str());`
	`515`	`+ return false;`
	`516`	`+ }`
`509`	`517`	`return true;`
`510`	`518`	`}`
`511`	`519`	`return false;`
`@@ -543,7 +551,11 @@ class FrameParamsCommand : public Command`
`543`	`551`	`{`
`544`	`552`	`if (args.size() == 1)`
`545`	`553`	`{`
`546`		`- frame = atoi (args[0].c_str());`
	`554`	`+ if (!sm_try_atoi (args[0].c_str(), frame) \|\| frame < 0)`
	`555`	`+ {`
	`556`	`+ fprintf (stderr, "invalid frame number '%s'\n", args[0].c_str());`
	`557`	`+ return false;`
	`558`	`+ }`
`547`	`559`	`return true;`
`548`	`560`	`}`
`549`	`561`	`return false;`
`@@ -711,7 +723,11 @@ class SpectrumCommand : public Command`
`711`	`723`	`{`
`712`	`724`	`if (args.size() == 1)`
`713`	`725`	`{`
`714`		`- frame = atoi (args[0].c_str());`
	`726`	`+ if (!sm_try_atoi (args[0].c_str(), frame) \|\| frame < 0)`
	`727`	`+ {`
	`728`	`+ fprintf (stderr, "invalid frame number '%s'\n", args[0].c_str());`
	`729`	`+ return false;`
	`730`	`+ }`
`715`	`731`	`return true;`
`716`	`732`	`}`
`717`	`733`	`return false;`
`@@ -902,8 +918,11 @@ class TuneAllFramesCommand : public Command`
`902`	`918`	`{`
`903`	`919`	`if (args.size() == 1)`
`904`	`920`	`{`
`905`		`- fundamental_est_n = atoi (args[0].c_str());`
`906`		`- assert (fundamental_est_n >= 1 && fundamental_est_n <= 3);`
	`921`	`+ if (!sm_try_atoi (args[0].c_str(), fundamental_est_n) \|\| fundamental_est_n < 1 \|\| fundamental_est_n > 3)`
	`922`	`+ {`
	`923`	`+ fprintf (stderr, "invalid number of partials '%s', should be integer between 1 and 3\n", args[0].c_str());`
	`924`	`+ return false;`
	`925`	`+ }`
`907`	`926`	`return true;`
`908`	`927`	`}`
`909`	`928`	`return false;`
`@@ -994,8 +1013,11 @@ class SmoothTuneCommand : public Command`
`994`	`1013`	`{`
`995`	`1014`	`if (args.size() == 3)`
`996`	`1015`	`{`
`997`		`- fundamental_est_n = atoi (args[0].c_str());`
`998`		`- assert (fundamental_est_n >= 1 && fundamental_est_n <= 3);`
	`1016`	`+ if (!sm_try_atoi (args[0].c_str(), fundamental_est_n) \|\| fundamental_est_n < 1 \|\| fundamental_est_n > 3)`
	`1017`	`+ {`
	`1018`	`+ fprintf (stderr, "invalid number of partials '%s', should be integer between 1 and 3\n", args[0].c_str());`
	`1019`	`+ return false;`
	`1020`	`+ }`
`999`	`1021`	`smooth_ms = sm_atof (args[1].c_str());`
`1000`	`1022`	`assert (smooth_ms > 10 && smooth_ms < 5000);`
`1001`	`1023`	`smooth_percent = sm_atof (args[2].c_str());`
`@@ -1194,7 +1216,11 @@ class ExtractSMCommand : public Command`
`1194`	`1216`	`{`
`1195`	`1217`	`if (args.size() == 2)`
`1196`	`1218`	`{`
`1197`		`- note = atoi (args[0].c_str());`
	`1219`	`+ if (!sm_try_atoi (args[0].c_str(), note) \|\| note < 0 \|\| note > 127)`
	`1220`	`+ {`
	`1221`	`+ fprintf (stderr, "invalid note '%s', should be integer between 0 and 127\n", args[0].c_str());`
	`1222`	`+ return false;`
	`1223`	`+ }`
`1198`	`1224`	`filename = args[1];`
`1199`	`1225`	`return true;`
`1200`	`1226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,13 @@ Options::parse (int *argc_p,`
`121`	`121`	`}`
`122`	`122`	`else if (check_arg (argc, argv, &i, "--midi-note", &opt_arg) \|\| check_arg (argc, argv, &i, "-m", &opt_arg))`
`123`	`123`	`{`
`124`		`- freq = freq_from_note (atoi (opt_arg));`
	`124`	`+ int note;`
	`125`	`+ if (!sm_try_atoi (opt_arg, note) \|\| note < 0 \|\| note > 127)`
	`126`	`+ {`
	`127`	`+ fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);`
	`128`	`+ exit (1);`
	`129`	`+ }`
	`130`	`+ freq = freq_from_note (note);`
`125`	`131`	`}`
`126`	`132`	`else if (check_arg (argc, argv, &i, "--gain", &opt_arg) \|\| check_arg (argc, argv, &i, "-g", &opt_arg))`
`127`	`133`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,11 @@ Options::parse (int *argc_p,`
`89`	`89`	`}`
`90`	`90`	`else if (check_arg (argc, argv, &i, "--midi-note", &opt_arg) \|\| check_arg (argc, argv, &i, "-m", &opt_arg))`
`91`	`91`	`{`
`92`		`- midi_note = atoi (opt_arg);`
	`92`	`+ if (!sm_try_atoi (opt_arg, midi_note) \|\| midi_note < 0 \|\| midi_note > 127)`
	`93`	`+ {`
	`94`	`+ fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);`
	`95`	`+ exit (1);`
	`96`	`+ }`
`93`	`97`	`}`
`94`	`98`	`else if (check_arg (argc, argv, &i, "--len", &opt_arg) \|\| check_arg (argc, argv, &i, "-l", &opt_arg))`
`95`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ using SpectMorph::Main;`
`43`	`43`
`44`	`44`	`using SpectMorph::string_printf;`
`45`	`45`	`using SpectMorph::sm_round_positive;`
	`46`	`+using SpectMorph::sm_try_atoi;`
`46`	`47`
`47`	`48`	`using std::string;`
`48`	`49`	`using std::vector;`
`@@ -567,7 +568,11 @@ Options::parse (int *argc_p,`
`567`	`568`	`}`
`568`	`569`	`else if (check_arg (argc, argv, &i, "-m", &opt_arg))`
`569`	`570`	`{`
`570`		`- midi_note = atoi (opt_arg);`
	`571`	`+ if (!sm_try_atoi (opt_arg, midi_note) \|\| midi_note < 0 \|\| midi_note > 127)`
	`572`	`+ {`
	`573`	`+ fprintf (stderr, "%s: invalid midi note '%s', should be integer between 0 and 127\n", options.program_name.c_str(), opt_arg);`
	`574`	`+ exit (1);`
	`575`	`+ }`
`571`	`576`	`}`
`572`	`577`	`else if (check_arg (argc, argv, &i, "-j", &opt_arg))`
`573`	`578`	`{`