normal	2015-05-27 10:09:11 +0900 (Wed, 27 May 2015)

  New Revision: 50646

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

  Log:
    openssl: use RB_GC_GUARD instead of volatile
    
    From doc/extension.rdoc:
    >
    > Using the RB_GC_GUARD macro is preferable to using the "volatile"
    > keyword in C.  RB_GC_GUARD has the following advantages:
    >
    > 1) the intent of the macro use is clear
    >
    > 2) RB_GC_GUARD only affects its call site, "volatile" generates some
    >    extra code every time the variable is used, hurting optimization.
    >
    > 3) "volatile" implementations may be buggy/inconsistent in some
    >    compilers and architectures. RB_GC_GUARD is customizable for broken
    >    systems/compilers without those without negatively affecting other
    >    systems.
    
    * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
      ossl_asn1_decode_all): use RB_GC_GUARD instead of volatile
      [ruby-core:69371] [Bug #11185]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_asn1.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50645)
+++ ChangeLog	(revision 50646)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed May 27 09:50:51 2015  Eric Wong  <e@8...>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
+	  ossl_asn1_decode_all): use RB_GC_GUARD instead of volatile
+	  [ruby-core:69371] [Bug #11185]
+
 Wed May 27 09:27:30 2015  Eric Wong  <e@8...>
 
 	* lib/drb/drb.rb (set_sockopt): remove redundant fcntl call
Index: ext/openssl/ossl_asn1.c
===================================================================
--- ext/openssl/ossl_asn1.c	(revision 50645)
+++ ext/openssl/ossl_asn1.c	(revision 50646)
@@ -1029,7 +1029,7 @@ static VALUE https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L1029
 ossl_asn1_traverse(VALUE self, VALUE obj)
 {
     unsigned char *p;
-    volatile VALUE tmp;
+    VALUE tmp;
     long len, read = 0, offset = 0;
 
     obj = ossl_to_der_if_possible(obj);
@@ -1037,6 +1037,7 @@ ossl_asn1_traverse(VALUE self, VALUE obj https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L1037
     p = (unsigned char *)RSTRING_PTR(tmp);
     len = RSTRING_LEN(tmp);
     ossl_asn1_decode0(&p, len, &offset, 0, 1, &read);
+    RB_GC_GUARD(tmp);
     int_ossl_decode_sanity_check(len, read, offset);
     return Qnil;
 }
@@ -1058,7 +1059,7 @@ ossl_asn1_decode(VALUE self, VALUE obj) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L1059
 {
     VALUE ret;
     unsigned char *p;
-    volatile VALUE tmp;
+    VALUE tmp;
     long len, read = 0, offset = 0;
 
     obj = ossl_to_der_if_possible(obj);
@@ -1066,6 +1067,7 @@ ossl_asn1_decode(VALUE self, VALUE obj) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L1067
     p = (unsigned char *)RSTRING_PTR(tmp);
     len = RSTRING_LEN(tmp);
     ret = ossl_asn1_decode0(&p, len, &offset, 0, 0, &read);
+    RB_GC_GUARD(tmp);
     int_ossl_decode_sanity_check(len, read, offset);
     return ret;
 }
@@ -1089,7 +1091,7 @@ ossl_asn1_decode_all(VALUE self, VALUE o https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L1091
     VALUE ary, val;
     unsigned char *p;
     long len, tmp_len = 0, read = 0, offset = 0;
-    volatile VALUE tmp;
+    VALUE tmp;
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
@@ -1104,6 +1106,7 @@ ossl_asn1_decode_all(VALUE self, VALUE o https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L1106
 	read += tmp_read;
 	tmp_len -= tmp_read;
     }
+    RB_GC_GUARD(tmp);
     int_ossl_decode_sanity_check(len, read, offset);
     return ary;
 }

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