diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-29 05:55:02 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-29 05:55:02 +0000 |
commit | 451fe269e5ab1270a53ac7bdeceabe47fd431f95 (patch) | |
tree | ed014c958a0f622db02af64186def2c70e4c00ba /ext/openssl/ossl_x509crl.c | |
parent | 5924f9a684ace630d3658a0d6e52270e3686ca9f (diff) | |
download | ruby-451fe269e5ab1270a53ac7bdeceabe47fd431f95.tar.gz |
openssl: wrapper object before alloc
* ext/openssl: make wrapper objects before allocating structs to
get rid of potential memory leaks.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_x509crl.c')
-rw-r--r-- | ext/openssl/ossl_x509crl.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c index ca272f9aa4..7133c7a901 100644 --- a/ext/openssl/ossl_x509crl.c +++ b/ext/openssl/ossl_x509crl.c @@ -10,11 +10,13 @@ */ #include "ossl.h" -#define WrapX509CRL(klass, obj, crl) do { \ +#define NewX509CRL(klass) \ + TypedData_Wrap_Struct((klass), &ossl_x509crl_type, 0) +#define SetX509CRL(obj, crl) do { \ if (!(crl)) { \ ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \ } \ - (obj) = TypedData_Wrap_Struct((klass), &ossl_x509crl_type, (crl)); \ + RTYPEDDATA_DATA(obj) = (crl); \ } while (0) #define GetX509CRL(obj, crl) do { \ TypedData_Get_Struct((obj), X509_CRL, &ossl_x509crl_type, (crl)); \ @@ -77,9 +79,10 @@ ossl_x509crl_new(X509_CRL *crl) X509_CRL *tmp; VALUE obj; + obj = NewX509CRL(cX509CRL); tmp = crl ? X509_CRL_dup(crl) : X509_CRL_new(); if(!tmp) ossl_raise(eX509CRLError, NULL); - WrapX509CRL(cX509CRL, obj, tmp); + SetX509CRL(obj, tmp); return obj; } @@ -93,10 +96,11 @@ ossl_x509crl_alloc(VALUE klass) X509_CRL *crl; VALUE obj; + obj = NewX509CRL(klass); if (!(crl = X509_CRL_new())) { ossl_raise(eX509CRLError, NULL); } - WrapX509CRL(klass, obj, crl); + SetX509CRL(obj, crl); return obj; } |