changeset 20308:b8c1b3e9aa91 stable

Fix segfault when '[]' used for row_vector_property. * graphics.in.h (row_vector_property::add_constraint (octave_idx_type len)): Remove validation that accepts 0x0 matrix. * graphics.in.h (image::init): Call add_constraint() to allow 0x0 since xdata, ydata can legitimately be '[]' for these properties.
author Rik <rik@octave.org>
date Tue, 23 Jun 2015 09:59:54 -0700
parents dc74b700cdec
children 140ce5e857bf 077e73619ba8
files libinterp/corefcn/graphics.in.h
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.in.h	Mon Jun 22 20:58:57 2015 +0200
+++ b/libinterp/corefcn/graphics.in.h	Tue Jun 23 09:59:54 2015 -0700
@@ -1461,6 +1461,7 @@
   {
     size_constraints.remove (dim_vector (1, -1));
     size_constraints.remove (dim_vector (-1, 1));
+    size_constraints.remove (dim_vector (0, 0));
 
     add_constraint (dim_vector (1, len));
     add_constraint (dim_vector (len, 1));
@@ -4692,7 +4693,9 @@
     void init (void)
     {
       xdata.add_constraint (2);
+      xdata.add_constraint (dim_vector (0, 0));
       ydata.add_constraint (2);
+      ydata.add_constraint (dim_vector (0, 0));
       cdata.add_constraint ("double");
       cdata.add_constraint ("single");
       cdata.add_constraint ("logical");