diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-03 05:28:00 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-03 05:28:00 +0000 |
| commit | 7bb73a0852c747478ff5ed030e2a857d201596b7 (patch) | |
| tree | 0efba350d763caa06f645aacff1977ea4f8730a3 /strftime.c | |
| parent | 6a288deabc6e718add4552111a6fd2434c723431 (diff) | |
| download | ruby-7bb73a0852c747478ff5ed030e2a857d201596b7.tar.gz | |
* strftime.c (STRFTIME): return 0 and ERANGE when precision is too
large. [ruby-dev:43284] fixes #4456
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'strftime.c')
| -rw-r--r-- | strftime.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/strftime.c b/strftime.c index dc6df615d7..9d9f48d0de 100644 --- a/strftime.c +++ b/strftime.c @@ -237,6 +237,10 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, const str i = rb_strftime_with_timespec(s, endp - s, (fmt), vtm, timev, ts, gmt); \ if (!i) return 0; \ if (precision > i) {\ + if (start + maxsize < s + precision) { \ + errno = ERANGE; \ + return 0; \ + } \ memmove(s + precision - i, s, i);\ memset(s, padding ? padding : ' ', precision - i); \ s += precision; \ |