Mercurial > octave
diff libinterp/corefcn/oct-stream.cc @ 33365:fb44a9db1bc6
Replace `xint_value` and related functions with stricter versions (bug #65538)
The conversion function `xint_value`, `xbool_value`, and `xidx_type_value`
were being used to convert input arguments to integers, booleans, or index
values respectively, and to provide a meaningful error message if the
conversion failed. The problem, as described in bug #65538, is that this
allows user code like `all (true (3), 2.718)` to be silently converted to
`all (true (3), 2)` instead of giving an error that the dimension needs to
be an integer. The same happens with `cell (e, pi)`, which silently creates
a 2x3 cell array. In both cases, this permissive conversion is a Matlab
incompatibility.
This patch provides an analogue of `xint_value` called `yint_value` that uses a
stricter conversion to integer, and also does the same for `bool` and
`idx_type` conversions. With this patch, passing non-integer sizes now gives
an error, and passing non-boolean values to boolean arguments now give a warning.
* libinterp/octave-value/ov.h: Define new functions `strict_int_value` and
`strict_bool_value` and declare new function `strict_idx_type_value`.
Declare corresponding new wrapper functions `yint_value`, `ybool_value`,
and `yidx_type_value`.
* libinterp/octave-value/ov.cc: Define `strict_idx_type_value`.
Define `yint_value`, `ybool_value`, and `yidx_type_value`
using the existing XVALUE_EXTRACTOR macro.
* Replace the corresponding function calls in: __eigs__.cc, besselj.cc,
bitfcns.cc, data.cc, file-io.cc, interpreter.cc, jsondecode.cc, load-path.cc,
oct-stream.cc, ov-cell.cc, psi.cc, pt-eval.cc, sparse.cc, strfns.cc,
syscalls.cc, time.cc, utils.cc, variables.cc, __glpk__.cc, __ode15__.cc,
pt-eval.cc
* NEWS.10.md: Add note about the Matlab compatibility of this patch.
Incidentally, the new conversion functions allow a FIXME note inside `fcntl`
to be addressed and removed.
author | Arun Giridhar <arungiridhar@gmail.com> |
---|---|
date | Mon, 08 Apr 2024 21:43:05 -0400 |
parents | 40fde86be9b0 |
children | 79cfa1b7a813 |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-stream.cc Mon Apr 08 20:27:33 2024 -0400 +++ b/libinterp/corefcn/oct-stream.cc Mon Apr 08 21:43:05 2024 -0400 @@ -3682,7 +3682,7 @@ } else if (param == "collectoutput") { - m_collect_output = args(i+1).xbool_value ("%s: CollectOutput must be logical or numeric", + m_collect_output = args(i+1).ybool_value ("%s: CollectOutput must be logical or numeric", m_who.c_str ()); } else if (param == "emptyvalue") @@ -3700,11 +3700,11 @@ else if (param == "multipledelimsasone") { m_multiple_delims_as_one = args(i - +1).xbool_value ("%s: MultipleDelimsAsOne must be logical or numeric", m_who.c_str ()); + +1).ybool_value ("%s: MultipleDelimsAsOne must be logical or numeric", m_who.c_str ()); } else if (param == "returnonerror") { - m_return_on_error = args(i+1).xbool_value ("%s: ReturnOnError must be logical or numeric", + m_return_on_error = args(i+1).ybool_value ("%s: ReturnOnError must be logical or numeric", m_who.c_str ()); } else if (param == "whitespace")