diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-11-10 08:15:19 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-11-10 08:15:19 +0000 |
| commit | b9d3d9f726a79f0c1091e80cfb21e27eaed130c0 (patch) | |
| tree | b4bffa1c2f8ab000bc31b745dfbfab91f6410c4d /misc | |
| parent | 2864e767053317538feafa815046fff89e5a16be (diff) | |
| download | glibc-b9d3d9f726a79f0c1091e80cfb21e27eaed130c0.zip glibc-b9d3d9f726a79f0c1091e80cfb21e27eaed130c0.tar.gz glibc-b9d3d9f726a79f0c1091e80cfb21e27eaed130c0.tar.bz2 | |
Update.
1999-11-10 Andreas Jaeger <aj@suse.de>
* string/strsignal.c (strsignal): Correct check for snprintf
return value.
* argp/argp-fmtstream.c (__argp_fmtstream_printf): Likewise.
* misc/efgcvt_r.c (APPEND): Correct check for too small buffer
according to changed snprintf return value.
Reported by Lawrence K. Chen <lchen@opentext.com>.
* misc/tst-efgcvt.c (special): Add tests for a too small buffer
for ecvt_r and fcvt_r.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/efgcvt_r.c | 3 | ||||
| -rw-r--r-- | misc/tst-efgcvt.c | 19 |
2 files changed, 19 insertions, 3 deletions
diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c index 80770e6..1a039ef 100644 --- a/misc/efgcvt_r.c +++ b/misc/efgcvt_r.c @@ -101,7 +101,8 @@ APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len) n = __snprintf (buf, len, "%.*" FLOAT_FMT_FLAG "f", MIN (ndigit, NDIGIT_MAX), value); - if (n < 0) + /* Check for a too small buffer. */ + if (n >= len) return -1; i = 0; diff --git a/misc/tst-efgcvt.c b/misc/tst-efgcvt.c index cfbaa21..74dd6bd 100644 --- a/misc/tst-efgcvt.c +++ b/misc/tst-efgcvt.c @@ -120,9 +120,10 @@ test (testcase tests[], efcvt_func efcvt, const char *name) void special (void) { - int decpt, sign; + int decpt, sign, res; char *p; - + char buf [1024]; + p = ecvt (NAN, 10, &decpt, &sign); if (sign != 0 || strcmp (p, "nan") != 0) output_error ("ecvt", NAN, 10, "nan", 0, 0, p, decpt, sign); @@ -135,6 +136,20 @@ special (void) (void) ecvt (123.456, 10000, &decpt, &sign); (void) fcvt (123.456, 10000, &decpt, &sign); + /* Some tests for for the reentrant functions. */ + /* Use a too small buffer. */ + res = ecvt_r (123.456, 10, &decpt, &sign, buf, 1); + if (res == 0) + { + printf ("ecvt_r with a too small buffer was succesful.\n"); + ++error_count; + } + res = fcvt_r (123.456, 10, &decpt, &sign, buf, 1); + if (res == 0) + { + printf ("fcvt_r with a too small buffer was succesful.\n"); + ++error_count; + } } |