Mercurial > hg > octave-lyh
changeset 6493:5fa513371dde
[project @ 2007-04-05 14:53:49 by jwe]
| author | jwe |
|---|---|
| date | Thu, 05 Apr 2007 14:53:49 +0000 |
| parents | bcfdc9f0d267 |
| children | 76a1a953533d |
| files | src/ChangeLog src/mex.cc |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-04-05 Laurent Mazet <laurent.mazet@motorola.com> + + * mex.cc (mxArray_octave_value::get_string): Copy nel elements, + not buflen elements. + 2007-04-05 John W. Eaton <jwe@octave.org> * oct-stream.cc (DO_DOUBLE_CONV): New macro.
--- a/src/mex.cc +++ b/src/mex.cc @@ -555,7 +555,7 @@ const char *p = tmp.data (); - for (int i = 0; i < buflen; i++) + for (int i = 0; i < nel; i++) buf[i] = p[i]; buf[nel] = 0; @@ -1223,16 +1223,16 @@ { int retval = 1; - int n = get_number_of_elements (); - - if (n < buflen) + int nel = get_number_of_elements (); + + if (nel < buflen) { mxChar *ptr = static_cast<mxChar *> (pr); - for (int i = 0; i < n; i++) + for (int i = 0; i < nel; i++) buf[i] = static_cast<char> (ptr[i]); - buf[n] = 0; + buf[nel] = 0; } return retval;