emboss	2012-03-29 10:27:17 +0900 (Thu, 29 Mar 2012)

  New Revision: 35167

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

  Log:
    * ext/openssl/ossl_pkcs7.c: fix crash when parsing garbage data.
    * test/openssl/test_pkcs7.rb: assert correct behavior for it.
      Thanks to Matt Venables for reporting the issue.
      [ruby-core:43250][Bug #6134]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_pkcs7.c
    trunk/test/openssl/test_pkcs7.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35166)
+++ ChangeLog	(revision 35167)
@@ -1,3 +1,10 @@
+Thu Mar 29 10:20:18 2012  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* ext/openssl/ossl_pkcs7.c: fix crash when parsing garbage data.
+	* test/openssl/test_pkcs7.rb: assert correct behavior for it.
+	  Thanks to Matt Venables for reporting the issue.
+	  [ruby-core:43250][Bug #6134]
+
 Thu Mar 29 10:16:05 2012  NAKAMURA Usaku  <usa@r...>
 
 	* thread_win32.c (TIME_QUANTUM_USEC): 10ms(= old setting) [experimental]
@@ -13,7 +20,7 @@
 
 Thu Mar 29 09:26:17 2012  Martin Bosslet  <Martin.Bosslet@g...>
 
-	* test/openssl/test_x509cert.rb: Exclude test that fails when issuing
+	* test/openssl/test_x509cert.rb: exclude test that fails when issuing
 	  a certificate with RSA signature and DSS1 digest for earlier
 	  OpenSSL versions when used in conjunction with OpenSSL 1.0.1.
 	  Thanks, Vit Ondruch, for reporting the issue.
Index: ext/openssl/ossl_pkcs7.c
===================================================================
--- ext/openssl/ossl_pkcs7.c	(revision 35166)
+++ ext/openssl/ossl_pkcs7.c	(revision 35167)
@@ -318,14 +318,17 @@
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
     p7 = PEM_read_bio_PKCS7(in, &pkcs, NULL, NULL);
-    DATA_PTR(self) = pkcs;
     if (!p7) {
 	OSSL_BIO_reset(in);
         p7 = d2i_PKCS7_bio(in, &pkcs);
-	if (!p7)
+	if (!p7) {
+	    BIO_free(in);
+	    PKCS7_free(pkcs);
+	    DATA_PTR(self) = NULL;
 	    ossl_raise(rb_eArgError, "Could not parse the PKCS7");
-	DATA_PTR(self) = pkcs;
+	}
     }
+    DATA_PTR(self) = pkcs;
     BIO_free(in);
     ossl_pkcs7_set_data(self, Qnil);
     ossl_pkcs7_set_err_string(self, Qnil);
Index: test/openssl/test_pkcs7.rb
===================================================================
--- test/openssl/test_pkcs7.rb	(revision 35166)
+++ test/openssl/test_pkcs7.rb	(revision 35167)
@@ -146,6 +146,11 @@
     assert_equal(3, recip[1].serial)
     assert_equal(data, p7.decrypt(@rsa1024, @ee2_cert))
   end
+  
+  def test_graceful_parsing_failure #[ruby-core:43250]
+    contents = File.read(__FILE__)
+    assert_raise(ArgumentError) { OpenSSL::PKCS7.new(contents) }
+  end
 end
 
 end

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