Mercurial > forge
changeset 37:7a7e93cfbd1e octave-forge
fix 0-termination bug in mxGetString
| author | pkienzle |
|---|---|
| date | Fri, 02 Nov 2001 15:42:57 +0000 |
| parents | 1421ec19fddf |
| children | 5e8b13e85fa7 |
| files | extra/mex/mex.cc |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/mex/mex.cc Wed Oct 31 21:51:32 2001 +0000 +++ b/extra/mex/mex.cc Fri Nov 02 15:42:57 2001 +0000 @@ -18,6 +18,8 @@ // * use unsigned short for mxChar rather than char // 2001-09-20 Paul Kienzle <pkienzle@users.sf.net> // * Need <float.h> for DBL_EPSILON +// 2001-11-02 Paul Kienzle <pkienzle@users.sf.net> +// * fixed mxGetString to put in the zero-terminator #include <float.h> #include <iomanip.h> @@ -681,7 +683,7 @@ { const int nr = ptr->rows(); const int nc = ptr->columns(); - const int n = nr*nc > buflen ? nr*nc : buflen; + const int n = nr*nc < buflen ? nr*nc : buflen; const double *pr = ptr->real(); for (int i = 0; i < n; i++) buf[i] = NINT(pr[i]); if (n < buflen) buf[n] = '\0';