nobu	2008-08-30 14:58:38 +0900 (Sat, 30 Aug 2008)

  New Revision: 18942

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

  Log:
    * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): fix for
      initialization of r18168.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_x509ext.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18941)
+++ ChangeLog	(revision 18942)
@@ -1,3 +1,8 @@
+Sat Aug 30 14:58:32 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): fix for
+	  initialization of r18168.
+
 Sat Aug 30 14:47:30 2008  Tanaka Akira  <akr@f...>
 
 	* ext/dl/mkcallback.rb: fix continuation line detection.
Index: ext/openssl/ossl_x509ext.c
===================================================================
--- ext/openssl/ossl_x509ext.c	(revision 18941)
+++ ext/openssl/ossl_x509ext.c	(revision 18942)
@@ -275,14 +275,16 @@
 {
     VALUE oid, value, critical;
     const unsigned char *p;
-    X509_EXTENSION *ext, *x = DATA_PTR(self);
+    X509_EXTENSION *ext, *x;
 
     GetX509Ext(self, ext);
     if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
 	oid = ossl_to_der_if_possible(oid);
 	StringValue(oid);
 	p = (unsigned char *)RSTRING_PTR(oid);
-	if(!d2i_X509_EXTENSION(&x, &p, RSTRING_LEN(oid)) && (DATA_PTR(self) = x, 1))
+	x = d2i_X509_EXTENSION(&ext, &p, RSTRING_LEN(oid));
+	DATA_PTR(self) = ext;
+	if(!x)
 	    ossl_raise(eX509ExtError, NULL);
 	return self;
     }

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