diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-03 00:20:23 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-03 00:20:57 +0100 |
| commit | 1d4e6ee3013b2c0bebf7d715318e6c493f41ee19 (patch) | |
| tree | f52bb884e335e5a2002bb2a8b6035678cb349f97 /libguile/generalized-vectors.c | |
| parent | 80aeb9af0d593da8647162ed2416a22c83bd1e70 (diff) | |
| download | guile-1d4e6ee3013b2c0bebf7d715318e6c493f41ee19.tar.gz | |
Fix `generalized-vector->list' indexing bug with shared arrays.
Fixes <http://bugs.gnu.org/12465>.
Reported by Daniel Llorens <daniel.llorens@bluewin.ch>.
* libguile/generalized-vectors.c (scm_generalized_vector_to_list): Fix
initial value of POS; pass the `h.base + pos', not just `pos' as the
`vref' argument.
* test-suite/tests/arrays.test ("array->list")["http://bugs.gnu.org/12465
- ok", "http://bugs.gnu.org/12465 - bad]: New tests.
("generalized-vector->list"): New test prefix.
Diffstat (limited to 'libguile/generalized-vectors.c')
| -rw-r--r-- | libguile/generalized-vectors.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/libguile/generalized-vectors.c b/libguile/generalized-vectors.c index d8a3bf8d3..4da0e884f 100644 --- a/libguile/generalized-vectors.c +++ b/libguile/generalized-vectors.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. - * +/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, + * 2005, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 3 of @@ -178,14 +179,21 @@ SCM_DEFINE (scm_generalized_vector_to_list, "generalized-vector->list", 1, 0, 0, "generalized vector @var{v}.") #define FUNC_NAME s_scm_generalized_vector_to_list { + /* FIXME: This duplicates `array_to_list'. */ SCM ret = SCM_EOL; - ssize_t pos, i = 0; + long inc; + ssize_t pos, i; scm_t_array_handle h; + scm_generalized_vector_get_handle (v, &h); - for (pos = h.dims[0].ubnd, i = (h.dims[0].ubnd - h.dims[0].lbnd); - i >= 0; - pos -= h.dims[0].inc, i--) - ret = scm_cons (h.impl->vref (&h, pos), ret); + + i = h.dims[0].ubnd - h.dims[0].lbnd + 1; + inc = h.dims[0].inc; + pos = (i - 1) * inc; + + for (; i > 0; i--, pos -= inc) + ret = scm_cons (h.impl->vref (&h, h.base + pos), ret); + scm_array_handle_release (&h); return ret; } |