Mercurial > octave

diff scripts/ode/private/check_default_input.m @ 28041:5e44268dca6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace input validation relying on str2func with alternatives (bug #57351). * ode15i.m, ode15s.m, ode23.m, ode45.m, check_default_input.m: Replace try/catch blocks around str2func with a call to exist() to check whether function exists before calling str2func.
author Rik <rik@octave.org>
date Mon, 03 Feb 2020 20:22:19 -0800
parents bd51beb6205e
children 3c37ae43996a 0a5b15007766
line wrap: on
line diff
--- a/scripts/ode/private/check_default_input.m	Mon Feb 03 13:46:20 2020 -0800
+++ b/scripts/ode/private/check_default_input.m	Mon Feb 03 20:22:19 2020 -0800
@@ -30,30 +30,30 @@
 
   if (! (nargin (fun) == nargin - 2))
     error ("Octave:invalid-input-arg",
-           [solver ": invalid value assigned to field '%s'"], "fun");
+           [solver ": invalid value assigned to field 'fun'"]);
   endif
 
   if (ischar (fun))
-    try
-      fun = str2func (fun);
-    catch
-      warning (lasterr);
-    end_try_catch
+    if (! exist (fun))
+      error ("Octave:invalid-input-arg",
+             [solver ": function '" fun "' not found"]);
+    endif
+    fun = str2func (fun);
   endif
   if (! is_function_handle (fun))
     error ("Octave:invalid-input-arg",
-               [solver ": invalid value assigned to field '%s'"], "fun");
+           [solver ": invalid value assigned to field '" fun "'"]);
   endif
 
   ## Check trange
   validateattributes (trange, {"float"}, {"vector", "real"}, solver, "trange");
 
   if (numel (trange) < 2)
-       error ("Octave:invalid-input-arg",
-               [solver ": invalid value assigned to field '%s'"], "trange");
+    error ("Octave:invalid-input-arg",
+           [solver ": invalid value assigned to field 'trange'"]);
   elseif (! ((all (diff (trange) > 0)) || all (diff (-trange) > 0)))
-        error ("Octave:invalid-input-arg",
-               [solver ": invalid value assigned to field '%s'"], "trange");
+    error ("Octave:invalid-input-arg",
+           [solver ": invalid value assigned to field 'trange'"]);
   endif
 
   ## Check y0 and yp0