# HG changeset patch # User jwe # Date 1175784829 0 # Node ID 5fa513371ddecaa4b99f6553e27e774c31aa71b3 # Parent bcfdc9f0d2670910b7b42ad0fff3a524ba2e1d93 [project @ 2007-04-05 14:53:49 by jwe] diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-04-05 Laurent Mazet + + * mex.cc (mxArray_octave_value::get_string): Copy nel elements, + not buflen elements. + 2007-04-05 John W. Eaton * oct-stream.cc (DO_DOUBLE_CONV): New macro. diff --git a/src/mex.cc b/src/mex.cc --- 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 (pr); - for (int i = 0; i < n; i++) + for (int i = 0; i < nel; i++) buf[i] = static_cast (ptr[i]); - buf[n] = 0; + buf[nel] = 0; } return retval;