diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509ext.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Aug 30 14:58:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): fix for + initialization of r18168. + Sat Aug 30 14:47:30 2008 Tanaka Akira <akr@fsij.org> * ext/dl/mkcallback.rb: fix continuation line detection. diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c index b87b027e07..f08006f34b 100644 --- a/ext/openssl/ossl_x509ext.c +++ b/ext/openssl/ossl_x509ext.c @@ -275,14 +275,16 @@ ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self) { 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; } |