kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

date_strftime.c: check precision

Browse source 
* ext/date/date_strftime.c (date_strftime_with_tmx): reject too
  large precision to get rid of buffer overflow.
  reported by Guido Vranken <guido AT guidovranken.nl>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-06-14 13:07:27 +00:00
parent 40799e5ef9
commit 58e8c9c895
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Jun 14 22:07:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/date/date_strftime.c (date_strftime_with_tmx): reject too
large precision to get rid of buffer overflow.
reported by Guido Vranken <guido AT guidovranken.nl>.
Tue Jun 14 21:40:42 2016 Kazuki Yamaguchi <k@rhe.jp>
* ext/openssl/ossl_ocsp.c (ossl_ocspbres_to_der, ossl_ocspcid_to_der):

9
ext/date/date_strftime.c
View file

@ -48,7 +48,7 @@ downcase(char *s, size_t i)
/* strftime --- produce formatted time */
static size_t
date_strftime_with_tmx(char *s, size_t maxsize, const char *format,
date_strftime_with_tmx(char *s, const size_t maxsize, const char *format,
const struct tmx *tmx)
{
char *endp = s + maxsize;
@ -575,7 +575,12 @@ date_strftime_with_tmx(char *s, size_t maxsize, const char *format,
case '5': case '6': case '7': case '8': case '9':
{
char *e;
precision = (int)strtoul(format, &e, 10);
unsigned long prec = strtoul(format, &e, 10);
if (prec > INT_MAX || prec > maxsize) {
errno = ERANGE;
return 0;
}
precision = (int)prec;
format = e - 1;
goto again;
}

8
test/date/test_date_strftime.rb
View file

@ -420,4 +420,12 @@ class TestDateStrftime < Test::Unit::TestCase
end
def test_overflow
assert_raise(ArgumentError, Errno::ERANGE) {
Date.new(2000,1,1).strftime("%2147483647c")
}
assert_raise(ArgumentError, Errno::ERANGE) {
DateTime.new(2000,1,1).strftime("%2147483647c")
}
end
end