From 22af994534bcdf81138b42c741a8b57fe09453e1 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Tue, 24 Aug 2004 00:09:47 +0000 Subject: * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i functions may replace the pointer indicated by the first argument. * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto. * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl_x509attr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext/openssl/ossl_x509attr.c') diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c index 576ad4c40..f03302d35 100644 --- a/ext/openssl/ossl_x509attr.c +++ b/ext/openssl/ossl_x509attr.c @@ -91,12 +91,13 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self) X509_ATTRIBUTE *attr; unsigned char *p; + GetX509Attr(self, attr); if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){ - GetX509Attr(self, attr); oid = ossl_to_der_if_possible(oid); StringValue(oid); p = RSTRING(oid)->ptr; - if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING(oid)->len)){ + if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self), + &p, RSTRING(oid)->len)){ ossl_raise(eX509AttrError, NULL); } return self; -- cgit