Permalink
Browse files

merge revision(s) 27064:

?\012
	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
	  store->ex_data.sk.  [ruby-core:28907] [ruby-core:23971]
	  [ruby-core:18121]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@33999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 225c319 commit a8ae652eb81f023930e14920440b0e68f0495818 @shyouhei shyouhei committed Dec 10, 2011
Showing with 7 additions and 0 deletions.
  1. +6 −0 ChangeLog
  2. +1 −0 ext/openssl/ossl_x509store.c
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 17 03:56:12 2011 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
+ store->ex_data.sk. [ruby-core:28907] [ruby-core:23971]
+ [ruby-core:18121]
+
Thu Jun 30 12:52:56 2011 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
View
1 ext/openssl/ossl_x509store.c
@@ -131,6 +131,7 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
/* BUG: This method takes any number of arguments but appears to ignore them. */
GetX509Store(self, store);
+ store->ex_data.sk = NULL;
X509_STORE_set_verify_cb_func(store, ossl_verify_cb);
ossl_x509store_set_vfy_cb(self, Qnil);

0 comments on commit a8ae652

Please sign in to comment.