tenderlove	2010-11-15 06:46:08 +0900 (Mon, 15 Nov 2010)

  New Revision: 29784

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29784

  Log:
    * etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
      pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c
    trunk/test/openssl/test_ssl.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29783)
+++ ChangeLog	(revision 29784)
@@ -1,3 +1,8 @@
+Mon Nov 15 06:43:48 2010  Aaron Patterson <aaron@t...>
+
+	* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
+	  pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]
+
 Sun Nov 14 17:57:45 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* enc/Makefile.in (distclean): should not remove sources which are
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 29783)
+++ ext/openssl/ossl_ssl.c	(revision 29784)
@@ -1337,7 +1337,7 @@
     X509 *cert = NULL;
 
     Data_Get_Struct(self, SSL, ssl);
-    if (ssl) {
+    if (!ssl) {
         rb_warning("SSL session is not started yet.");
         return Qnil;
     }
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 29783)
+++ test/openssl/test_ssl.rb	(revision 29784)
@@ -160,6 +160,10 @@
     assert_equal(ctx.setup, nil)
   end
 
+  def test_not_started_session
+    OpenSSL::SSL::SSLSocket.new(STDIN).cert
+  end
+
   def test_ssl_read_nonblock
     start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) { |server, port|
       sock = TCPSocket.new("127.0.0.1", port)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/