summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-05 17:07:59 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-05 17:07:59 +0000
commit8d0e66afdf4c7efedc33dedcc90e6414dde93ccb (patch)
tree7aac1fc6fdbb8b8e1e789b0df78a384c0f52a731
parentd93a35b55455d2d615f3c7df2057a62031f78d2f (diff)
* ext/digest/digest.c (hexdigest_str_new): Add a string size check.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/digest/digest.c9
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f92ec8d035b..32b50b2f8f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 6 02:06:10 2006 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/digest/digest.c (hexdigest_str_new): Add a string size check.
+
Thu Oct 5 19:28:35 2006 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.[ch]: Since the argument order of
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index f56a1921f8f..63df4b126d1 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -45,7 +45,14 @@ hexdigest_str_new(const unsigned char *digest, size_t digest_len)
int i;
VALUE str;
char *p;
- static const char hex[] = "0123456789abcdef";
+ static const char hex[] = {
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ 'a', 'b', 'c', 'd', 'e', 'f'
+ };
+
+ if (LONG_MAX / 2 < digest_len) {
+ rb_raise(rb_eRuntimeError, "digest string too long");
+ }
str = rb_str_new(0, digest_len * 2);