diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-10 07:49:00 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-10 07:49:00 +0000 |
| commit | 775e54fe7beda13076b0296db830a25da9995c0d (patch) | |
| tree | 61ffc27e1a735ef05e04d6afe1dd52daa15f69ce | |
| parent | f7579abceccc77f8e7912c0117bcb3c19f95017c (diff) | |
* ext/digest/digest.c (hexdigest_str_new, bubblebabble_str_new):
Perform StringValue() checks properly.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/digest/digest.c | 16 |
2 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Oct 10 16:39:08 2006 Akinori MUSHA <knu@iDaemons.org> + + * ext/digest/digest.c (hexdigest_str_new, bubblebabble_str_new): + Perform StringValue() checks properly. + Tue Oct 10 13:21:21 2006 Akinori MUSHA <knu@iDaemons.org> * ext/digest/sha1/depend, ext/digest/sha2/depend: Remove obsolete diff --git a/ext/digest/digest.c b/ext/digest/digest.c index 8c348078a4..53c05f9ef4 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -42,8 +42,8 @@ get_digest_base_metadata(VALUE klass) static VALUE hexdigest_str_new(VALUE str_digest) { - char *digest = RSTRING_PTR(str_digest); - size_t digest_len = RSTRING_LEN(str_digest); + char *digest; + size_t digest_len; int i; VALUE str; char *p; @@ -52,6 +52,10 @@ hexdigest_str_new(VALUE str_digest) 'a', 'b', 'c', 'd', 'e', 'f' }; + StringValue(str_digest); + digest = RSTRING_PTR(str_digest); + digest_len = RSTRING_LEN(str_digest); + if (LONG_MAX / 2 < digest_len) { rb_raise(rb_eRuntimeError, "digest string too long"); } @@ -71,8 +75,8 @@ hexdigest_str_new(VALUE str_digest) static VALUE bubblebabble_str_new(VALUE str_digest) { - char *digest = RSTRING_PTR(str_digest); - size_t digest_len = RSTRING_LEN(str_digest); + char *digest; + size_t digest_len; VALUE str; char *p; int i, j, seed = 1; @@ -84,6 +88,10 @@ bubblebabble_str_new(VALUE str_digest) 'p', 'r', 's', 't', 'v', 'z', 'x' }; + StringValue(str_digest); + digest = RSTRING_PTR(str_digest); + digest_len = RSTRING_LEN(str_digest); + if ((LONG_MAX - 2) / 3 < (digest_len | 1)) { rb_raise(rb_eRuntimeError, "digest string too long"); } |