Mercurial > hg > octave-nkf
comparison liboctave/Array.cc @ 14440:3d4bea9accd7 stable
Fix segfault on multidimensional median call (bug #35679).
* Array.c (Array::nth_elemnt): Readjust dim after chopping singletons.
* median.m: Add tests.
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Wed, 07 Mar 2012 00:02:41 -0500 |
| parents | 727504fd26f0 |
| children | 12ccdce2c216 edf9ca8a92a8 |
comparison
equal
deleted
inserted
replaced
| 14433:ec660526ae50 | 14440:3d4bea9accd7 |
|---|---|
| 2251 | 2251 |
| 2252 octave_idx_type nn = n.length (ns); | 2252 octave_idx_type nn = n.length (ns); |
| 2253 | 2253 |
| 2254 dv(dim) = std::min (nn, ns); | 2254 dv(dim) = std::min (nn, ns); |
| 2255 dv.chop_trailing_singletons (); | 2255 dv.chop_trailing_singletons (); |
| 2256 dim = std::min (dv.length (), dim); | |
| 2256 | 2257 |
| 2257 Array<T> m (dv); | 2258 Array<T> m (dv); |
| 2258 | 2259 |
| 2259 if (m.numel () == 0) | 2260 if (m.numel () == 0) |
| 2260 return m; | 2261 return m; |