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

digest.c: typed data

Browse source 
* ext/digest/digest.c (rb_digest_base_alloc): use typed data.

* ext/digest/digest.c (rb_digest_base_copy): fail unless original
  object has same algorithm.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-09-27 01:30:16 +00:00
parent 851c2f2dab
commit 15ae462d8b
2 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ext/digest/digest.c
View file

@ -535,6 +535,13 @@ get_digest_base_metadata(VALUE klass)
return algo; return algo;
} }
static const rb_data_type_t digest_type = {
"digest",
{0, RUBY_TYPED_DEFAULT_FREE, 0,},
NULL, NULL,
(RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED),
};
static inline void static inline void
algo_init(const rb_digest_metadata_t *algo, void *pctx) algo_init(const rb_digest_metadata_t *algo, void *pctx)
{ {
@ -559,7 +566,7 @@ rb_digest_base_alloc(VALUE klass)
pctx = xmalloc(algo->ctx_size); pctx = xmalloc(algo->ctx_size);
algo_init(algo, pctx); algo_init(algo, pctx);
obj = Data_Wrap_Struct(klass, 0, xfree, pctx); obj = TypedData_Wrap_Struct(klass, &digest_type, pctx);
return obj; return obj;
} }
@ -576,9 +583,11 @@ rb_digest_base_copy(VALUE copy, VALUE obj)
rb_check_frozen(copy); rb_check_frozen(copy);
algo = get_digest_base_metadata(rb_obj_class(copy)); algo = get_digest_base_metadata(rb_obj_class(copy));
if (algo != get_digest_base_metadata(rb_obj_class(obj)))
rb_raise(rb_eTypeError, "different algorithms");
Data_Get_Struct(obj, void, pctx1); TypedData_Get_Struct(obj, void, &digest_type, pctx1);
Data_Get_Struct(copy, void, pctx2); TypedData_Get_Struct(copy, void, &digest_type, pctx2);
memcpy(pctx2, pctx1, algo->ctx_size); memcpy(pctx2, pctx1, algo->ctx_size);
return copy; return copy;
@ -593,7 +602,7 @@ rb_digest_base_reset(VALUE self)
algo = get_digest_base_metadata(rb_obj_class(self)); algo = get_digest_base_metadata(rb_obj_class(self));
Data_Get_Struct(self, void, pctx); TypedData_Get_Struct(self, void, &digest_type, pctx);
algo_init(algo, pctx); algo_init(algo, pctx);
@ -609,7 +618,7 @@ rb_digest_base_update(VALUE self, VALUE str)
algo = get_digest_base_metadata(rb_obj_class(self)); algo = get_digest_base_metadata(rb_obj_class(self));
Data_Get_Struct(self, void, pctx); TypedData_Get_Struct(self, void, &digest_type, pctx);
StringValue(str); StringValue(str);
algo->update_func(pctx, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str)); algo->update_func(pctx, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
@ -627,7 +636,7 @@ rb_digest_base_finish(VALUE self)
algo = get_digest_base_metadata(rb_obj_class(self)); algo = get_digest_base_metadata(rb_obj_class(self));
Data_Get_Struct(self, void, pctx); TypedData_Get_Struct(self, void, &digest_type, pctx);
str = rb_str_new(0, algo->digest_len); str = rb_str_new(0, algo->digest_len);
algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str)); algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str));

12
test/digest/test_digest.rb
View file

@ -198,4 +198,16 @@ module TestDigest
assert_raise(NotImplementedError, bug3810) {Digest::Base.new} assert_raise(NotImplementedError, bug3810) {Digest::Base.new}
end end
end end
class TestInitCopy < Test::Unit::TestCase
if defined?(Digest::MD5) and defined?(Digest::RMD160)
def test_initialize_copy_md5_rmd160
assert_separately(%w[-rdigest], <<-'end;')
md5 = Digest::MD5.allocate
rmd160 = Digest::RMD160.allocate
assert_raise(TypeError) {md5.__send__(:initialize_copy, rmd160)}
end;
end
end
end
end end