Mercurial > hg > octave-lyh

diff scripts/plot/contourc.m @ 10634:60542efcfa2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check input arguments for size and type (bug #29861). Prevents segmentation fault with odd inputs.
author Rik <octave@nomad.inbox5.com>
date Sun, 16 May 2010 18:28:59 -0700
parents 09da0bd91412
children be55736a0783
line wrap: on
line diff
--- a/scripts/plot/contourc.m
+++ b/scripts/plot/contourc.m
@@ -64,9 +64,6 @@
   if (nargin == 1)
     vn = 10;
     z = varargin{1};
-    [nr, nc] = size (z);
-    x = 1:nc;
-    y = 1:nr;
   elseif (nargin == 2)
     vn = varargin{2};
     z = varargin{1};
@@ -87,6 +84,10 @@
     print_usage ();
   endif
 
+  if (!ismatrix (z) || isvector (z) || isscalar (z))
+    error ("contourc: z argument must be a matrix");
+  endif
+
   if (isscalar (vn))
     vv = linspace (min (z(:)), max (z(:)), vn+2)(2:end-1);
   else