Mercurial > octave-nkf
changeset 12975:f89449967f0d
deblank.m, strtrim.m: Correctly validate cellstr inputs (Bug #34038)
deblank.m, strtrim.m: Use iscellstr() instead of iscell() to validate input.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Thu, 18 Aug 2011 22:23:16 -0700 |
parents | 6590446c2498 |
children | 421f2030bb76 |
files | scripts/strings/deblank.m scripts/strings/strtrim.m |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/strings/deblank.m Tue Aug 16 22:19:56 2011 -0700 +++ b/scripts/strings/deblank.m Thu Aug 18 22:23:16 2011 -0700 @@ -42,7 +42,7 @@ s = s(:,1:ceil (max (k) / rows (s))); endif - elseif (iscell (s)) + elseif (iscellstr (s)) s = regexprep (s, "[\\s\v\\0]+$", '');
--- a/scripts/strings/strtrim.m Tue Aug 16 22:19:56 2011 -0700 +++ b/scripts/strings/strtrim.m Thu Aug 18 22:23:16 2011 -0700 @@ -53,7 +53,7 @@ s = s(:, ceil (min (k) / rows (s)):ceil (max (k) / rows (s))); endif - elseif (iscell (s)) + elseif (iscellstr (s)) s = regexprep (s, "^[\\s\v]+|[\\s\v]+$", '');