From ea74a92bedb9eaba56725b87841fa8b7eb97a46d Mon Sep 17 00:00:00 2001 From: emboss Date: Fri, 22 Jul 2011 00:19:32 +0000 Subject: * backport r32604 from trunk. * 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/branches/ruby_1_9_3@32605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ ext/openssl/ossl_engine.c | 6 +++++- test/openssl/test_engine.rb | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 test/openssl/test_engine.rb diff --git a/ChangeLog b/ChangeLog index 602c4a1f43..f9a279ada4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Jul 22 09:17:43 2011 Martin Bosslet + + * backport r32604 from trunk. + + * 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] + Fri Jul 22 06:39:34 2011 Marc-Andre Lafortune * lib/csv.rb: Do not modify CSV.generate's argument [ruby-core:38356] diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index 111e418f91..79f51b8cdb 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/openssl/test_engine.rb b/test/openssl/test_engine.rb new file mode 100644 index 0000000000..6d90e34398 --- /dev/null +++ b/test/openssl/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 -- cgit v1.2.3