diff options
author | emboss <emboss@ruby-lang.org> | 2011-07-22 00:13:07 +0000 |
---|---|---|
committer | emboss <emboss@ruby-lang.org> | 2011-07-22 00:13:07 +0000 |
commit | 7f2e1c9a8609736846315e1332e52df2b5f14351 (patch) | |
tree | c05523f1e61bb01869534751f037c87da386e4e2 | |
parent | c119b298522933b0d13d081bd4dbd2393ca9b9c9 (diff) | |
download | ruby-openssl-history-7f2e1c9a8609736846315e1332e52df2b5f14351.tar.gz |
* ext/openssl/ossl_engine.c: Avoid double free of ENGINE reference.
* test/openssl/test_engine.rb: Add a test for it.
Thanks to Ippei Obayashi for providing the patch.
[ Ruby 1.9 - Bug #5062 ] [ruby-dev:44173]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ext/openssl/ossl_engine.c | 6 | ||||
-rw-r--r-- | test/test_engine.rb | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index 111e418..79f51b8 100644 --- a/ext/openssl/ossl_engine.c +++ b/ext/openssl/ossl_engine.c @@ -115,7 +115,11 @@ ossl_engine_s_engines(VALUE klass) ary = rb_ary_new(); for(e = ENGINE_get_first(); e; e = ENGINE_get_next(e)){ - WrapEngine(klass, obj, e); + /* Need a ref count of two here because of ENGINE_free being + * called internally by OpenSSL when moving to the next ENGINE + * and by us when releasing the ENGINE reference */ + ENGINE_up_ref(e); + WrapEngine(klass, obj, e); rb_ary_push(ary, obj); } diff --git a/test/test_engine.rb b/test/test_engine.rb new file mode 100644 index 0000000..6d90e34 --- /dev/null +++ b/test/test_engine.rb @@ -0,0 +1,15 @@ +require_relative 'utils' + +if defined?(OpenSSL) + +class OpenSSL::TestEngine < Test::Unit::TestCase + + def test_engines_free # [ruby-dev:44173] + OpenSSL::Engine.load + OpenSSL::Engine.engines + OpenSSL::Engine.engines + end + +end + +end |