yugui	2009-04-19 22:32:51 +0900 (Sun, 19 Apr 2009)

  New Revision: 23214

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

  Log:
    merges r22924 from trunk into ruby_1_9_1.
    --
    * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use
      OPENSSL_free instead of free.  a patch from Charlie Savage at
      [ruby-core:22858].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/openssl/ossl_x509ext.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23213)
+++ ruby_1_9_1/ChangeLog	(revision 23214)
@@ -1,3 +1,9 @@
+Fri Mar 13 15:10:43 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use
+	  OPENSSL_free instead of free.  a patch from Charlie Savage a
+	  [ruby-core:22858].
+
 Fri Mar 13 08:06:48 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* util.c (rv_strdup): macro to duplicate nul-terminated string.
Index: ruby_1_9_1/ext/openssl/ossl_x509ext.c
===================================================================
--- ruby_1_9_1/ext/openssl/ossl_x509ext.c	(revision 23213)
+++ ruby_1_9_1/ext/openssl/ossl_x509ext.c	(revision 23214)
@@ -325,15 +325,15 @@
 	ossl_raise(eX509ExtError, "malloc error");
     memcpy(s, RSTRING_PTR(data), RSTRING_LEN(data));
     if(!(asn1s = ASN1_OCTET_STRING_new())){
-	free(s);
+	OPENSSL_free(s);
 	ossl_raise(eX509ExtError, NULL);
     }
     if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LEN(data))){
-	free(s);
+	OPENSSL_free(s);
 	ASN1_OCTET_STRING_free(asn1s);
 	ossl_raise(eX509ExtError, NULL);
     }
-    free(s);
+    OPENSSL_free(s);
     GetX509Ext(self, ext);
     X509_EXTENSION_set_data(ext, asn1s);
 

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