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_x509req.c | |
| parent | 5924f9a684ace630d3658a0d6e52270e3686ca9f (diff) | |
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_x509req.c')
| -rw-r--r-- | ext/openssl/ossl_x509req.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c index 59b5d24692..aa5c423c1e 100644 --- a/ext/openssl/ossl_x509req.c +++ b/ext/openssl/ossl_x509req.c @@ -10,11 +10,13 @@ */ #include "ossl.h" -#define WrapX509Req(klass, obj, req) do { \ +#define NewX509Req(klass) \ + TypedData_Wrap_Struct((klass), &ossl_x509req_type, 0) +#define SetX509Req(obj, req) do { \ if (!(req)) { \ ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \ } \ - (obj) = TypedData_Wrap_Struct((klass), &ossl_x509req_type, (req)); \ + RTYPEDDATA_DATA(obj) = (req); \ } while (0) #define GetX509Req(obj, req) do { \ TypedData_Get_Struct((obj), X509_REQ, &ossl_x509req_type, (req)); \ @@ -56,6 +58,7 @@ ossl_x509req_new(X509_REQ *req) X509_REQ *new; VALUE obj; + obj = NewX509Req(cX509Req); if (!req) { new = X509_REQ_new(); } else { @@ -64,7 +67,7 @@ ossl_x509req_new(X509_REQ *req) if (!new) { ossl_raise(eX509ReqError, NULL); } - WrapX509Req(cX509Req, obj, new); + SetX509Req(obj, new); return obj; } @@ -101,10 +104,11 @@ ossl_x509req_alloc(VALUE klass) X509_REQ *req; VALUE obj; + obj = NewX509Req(klass); if (!(req = X509_REQ_new())) { ossl_raise(eX509ReqError, NULL); } - WrapX509Req(klass, obj, req); + SetX509Req(obj, req); return obj; } |