diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-23 23:59:44 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-23 23:59:44 +0000 |
| commit | ef5ce7029d1cc25ca9026f55bcc5d37253dd6480 (patch) | |
| tree | 1af7d7dd6c5929d604af8da0df43cc8752be56d3 /ext/openssl/ossl_x509attr.c | |
| parent | b1ba6aebf9abbed4afa04c7d884ca5a4d112c413 (diff) | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@6810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_x509attr.c')
| -rw-r--r-- | ext/openssl/ossl_x509attr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c index 576ad4c40a..f03302d352 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; |