From 379fa42f6db7c7f88cc2eddde8326441086e7aed Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 29 Aug 2008 03:19:15 +0000 Subject: * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): fix for initialization of r18168. * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): ditto. * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl_x509name.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ext/openssl/ossl_x509name.c') diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 58e2487485..fd8e329a85 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -137,13 +137,14 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self) else{ const unsigned char *p; VALUE str = ossl_to_der_if_possible(arg); - X509_NAME *x = DATA_PTR(self); + X509_NAME *x; StringValue(str); p = (unsigned char *)RSTRING_PTR(str); - if(!d2i_X509_NAME(&x, &p, RSTRING_LEN(str)) && (DATA_PTR(self) = x, 1)){ + x = d2i_X509_NAME(&name, &p, RSTRING_LEN(str)); + DATA_PTR(self) = name; + if(!x){ ossl_raise(eX509NameError, NULL); } - DATA_PTR(self) = x; } } -- cgit v1.2.3