diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-30 10:42:40 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-30 10:42:40 +0000 |
| commit | 40c5a0ce83caff0aa98563f4d500cf0c7a9244df (patch) | |
| tree | d54aa5d5f840daa3bd45a4e457ad88f43577b42a | |
| parent | 0485394d28b4420965a9f21accf2441cb4643b55 (diff) | |
| download | ruby-40c5a0ce83caff0aa98563f4d500cf0c7a9244df.tar.gz ruby-40c5a0ce83caff0aa98563f4d500cf0c7a9244df.tar.xz ruby-40c5a0ce83caff0aa98563f4d500cf0c7a9244df.zip | |
* ext/syck/rubyext.c (rb_syck_mktime): avoid segmentation fault.
[ruby-core:13735]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bootstraptest/test_knownbug.rb | 1 | ||||
| -rw-r--r-- | ext/syck/rubyext.c | 8 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Nov 30 19:33:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/syck/rubyext.c (rb_syck_mktime): avoid segmentation fault. + [ruby-core:13735] + Fri Nov 30 19:05:55 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * enum.c (enum_count): precise argument number check. diff --git a/bootstraptest/test_knownbug.rb b/bootstraptest/test_knownbug.rb index 0cf5cf271..947a94422 100644 --- a/bootstraptest/test_knownbug.rb +++ b/bootstraptest/test_knownbug.rb @@ -3,6 +3,7 @@ # So all tests will cause failure. # +$:.unshift File.join(File.dirname(__FILE__), "../.ext/#{RUBY_PLATFORM}") assert_normal_exit %q{ STDERR.reopen(STDOUT) require 'yaml' diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index 8e01bc176..4ee1a30be 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -262,9 +262,13 @@ rb_syck_mktime(char *str, long len) { char padded[] = "000000"; char *end = ptr + 1; + char *p = end; while ( isdigit( *end ) ) end++; - MEMCPY(padded, ptr + 1, char, end - (ptr + 1)); - usec = strtol(padded, NULL, 10); + if (end - p < sizeof(padded)) { + MEMCPY(padded, ptr + 1, char, end - (ptr + 1)); + p = padded; + } + usec = strtol(p, NULL, 10); } else { |