Mercurial > hg > octave-avbm
changeset 9683:5b3b9dcfd59c
fix crash in cellfun
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Thu, 01 Oct 2009 21:58:01 +0200 |
parents | c338cb954e58 |
children | c5ff5f858cfd |
files | src/ChangeLog src/DLD-FUNCTIONS/cellfun.cc |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-10-01 Jaroslav Hajek <highegg@gmail.com> + + * DLD-FUNCTIONS/cellfun.cc (Fcellfun): Fix initialization, add missing + break. + 2009-10-01 John W. Eaton <jwe@octave.org> * gl-render.cc (opengl_renderer::draw (const image::properties&)):
--- a/src/DLD-FUNCTIONS/cellfun.cc +++ b/src/DLD-FUNCTIONS/cellfun.cc @@ -475,13 +475,12 @@ inputlist(j) = cinputs[j](0); } - k = inputs[0].numel (); - for (int j = 0; j < nargin; j++) { if (mask[j]) { fdims = inputs[j].dims (); + k = inputs[j].numel (); for (int i = j+1; i < nargin; i++) { if (mask[i] && inputs[i].dims () != fdims) @@ -490,6 +489,7 @@ goto cellfun_err; } } + break; } }