6a15ee56b6
Since many changes from previous release, please refer http://www.ruby-lang.org/en/news/2010/08/16/ruby-1-8-7-p302-is-released/. Note: Since all security updates are already in previous package, This update dosen't include any securify fix.
32 lines
1,017 B
Text
32 lines
1,017 B
Text
$NetBSD: patch-dt,v 1.2 2010/09/10 03:29:00 taca Exp $
|
|
|
|
* r18172: suppress warnings.
|
|
* r26838: backport the commit from trunk.
|
|
|
|
--- ext/openssl/ossl_x509crl.c.orig 2010-06-21 09:18:59.000000000 +0000
|
|
+++ ext/openssl/ossl_x509crl.c
|
|
@@ -91,7 +91,7 @@ static VALUE
|
|
ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
BIO *in;
|
|
- X509_CRL *crl;
|
|
+ X509_CRL *crl, *x = DATA_PTR(self);
|
|
VALUE arg;
|
|
|
|
if (rb_scan_args(argc, argv, "01", &arg) == 0) {
|
|
@@ -99,10 +99,12 @@ ossl_x509crl_initialize(int argc, VALUE
|
|
}
|
|
arg = ossl_to_der_if_possible(arg);
|
|
in = ossl_obj2bio(arg);
|
|
- crl = PEM_read_bio_X509_CRL(in, (X509_CRL **)&DATA_PTR(self), NULL, NULL);
|
|
+ crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
|
|
+ DATA_PTR(self) = x;
|
|
if (!crl) {
|
|
- BIO_reset(in);
|
|
- crl = d2i_X509_CRL_bio(in, (X509_CRL **)&DATA_PTR(self));
|
|
+ (void)BIO_reset(in);
|
|
+ crl = d2i_X509_CRL_bio(in, &x);
|
|
+ DATA_PTR(self) = x;
|
|
}
|
|
BIO_free(in);
|
|
if (!crl) ossl_raise(eX509CRLError, NULL);
|