summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/digest/digest.c16
2 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 79c7ca6598a..39a5d159e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 8c348078a4f..53c05f9ef4a 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");
}