Mercurial > octave
changeset 26504:c7e5fb5c63c9 stable
fCDiagMatrix.cc: Fix static analyzer detected issues (bug #55347).
* fCDiagMatrix.cc (FloatComplexDiagMatrix::row (octave_idx_type)): Delete useless
check on "r > c".
* fCDiagMatrix.cc (FloatComplexDiagMatrix::row (char *s)): Get first character
with "s[0]" rather than "*s".
* fCDiagMatrix.cc (FloatComplexDiagMatrix::column (octave_idx_type)): Delete useless
check on "r < c".
* fCDiagMatrix.cc (FloatComplexDiagMatrix::column (char *s)): Get first character
with "s[0]" rather than "*s".
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 08 Jan 2019 20:45:19 -0800 |
| parents | a534d1be2aa0 |
| children | af476ac04cfd |
| files | liboctave/array/fCDiagMatrix.cc |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/array/fCDiagMatrix.cc Tue Jan 08 20:38:58 2019 -0800 +++ b/liboctave/array/fCDiagMatrix.cc Tue Jan 08 20:45:19 2019 -0800 @@ -251,7 +251,7 @@ (*current_liboctave_error_handler) ("invalid row selection"); FloatComplexRowVector retval (c, 0.0); - if (r <= c || (r > c && i < c)) + if (r <= c || i < c) retval.elem (i) = elem (i, i); return retval; @@ -263,7 +263,7 @@ if (! s) (*current_liboctave_error_handler) ("invalid row selection"); - char c = *s; + char c = s[0]; if (c == 'f' || c == 'F') return row (static_cast<octave_idx_type> (0)); else if (c == 'l' || c == 'L') @@ -281,7 +281,7 @@ (*current_liboctave_error_handler) ("invalid column selection"); FloatComplexColumnVector retval (r, 0.0); - if (r >= c || (r < c && i < r)) + if (r >= c || i < r) retval.elem (i) = elem (i, i); return retval; @@ -293,7 +293,7 @@ if (! s) (*current_liboctave_error_handler) ("invalid column selection"); - char c = *s; + char c = s[0]; if (c == 'f' || c == 'F') return column (static_cast<octave_idx_type> (0)); else if (c == 'l' || c == 'L')