nagachika	2014-05-28 23:44:07 +0900 (Wed, 28 May 2014)

  New Revision: 46214

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

  Log:
    merge revision(s) r45701: [Backport #9771]
    
    * ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value
      other than Symbol is an undefined behavior.  fix up r31699.
      [ruby-core:62142] [Bug #9771]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/openssl/ossl_asn1.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46213)
+++ ruby_2_1/ChangeLog	(revision 46214)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed May 28 23:40:57 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value
+	  other than Symbol is an undefined behavior.  fix up r31699.
+	  [ruby-core:62142] [Bug #9771]
+
 Wed May 28 23:37:32 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/stringio/stringio.c (strio_putc): fix for non-ascii
Index: ruby_2_1/ext/openssl/ossl_asn1.c
===================================================================
--- ruby_2_1/ext/openssl/ossl_asn1.c	(revision 46213)
+++ ruby_2_1/ext/openssl/ossl_asn1.c	(revision 46214)
@@ -1150,7 +1150,7 @@ ossl_asn1_initialize(int argc, VALUE *ar https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/openssl/ossl_asn1.c#L1150
 	}
 	if(!SYMBOL_P(tag_class))
 	    ossl_raise(eASN1Error, "invalid tag class");
-	if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
+	if(!NIL_P(tagging) && SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
 	    ossl_raise(eASN1Error, "tag number for Universal too large");
     }
     else{
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46213)
+++ ruby_2_1/version.h	(revision 46214)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-05-28"
-#define RUBY_PATCHLEVEL 113
+#define RUBY_PATCHLEVEL 114
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45701


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