1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/openssl] x509store: fix memory leak in X509::StoreContext.new

Browse Source 
The certificate passed as the second argument was not properly free'd
in the error paths.

https://github.com/ruby/openssl/commit/9561199b9f
This commit is contained in:
Kazuki Yamaguchi 2020-08-09 00:22:08 +09:00
parent 871c61d5d0
commit 62d889c857
Notes: git 2021-03-16 20:38:45 +09:00 
Merged: https://github.com/ruby/ruby/pull/4275
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ext/openssl/ossl_x509store.c
View File

@ -509,7 +509,9 @@ static VALUE ossl_x509stctx_set_time(VALUE, VALUE);
/* /*
* call-seq: * call-seq:
* StoreContext.new(store, cert = nil, chain = nil) * StoreContext.new(store, cert = nil, untrusted = nil)
*
* Sets up a StoreContext for a verification of the X.509 certificate _cert_.
*/ */
static VALUE static VALUE
ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self) ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
@ -519,15 +521,24 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
X509_STORE *x509st; X509_STORE *x509st;
X509 *x509 = NULL; X509 *x509 = NULL;
STACK_OF(X509) *x509s = NULL; STACK_OF(X509) *x509s = NULL;
int state;
rb_scan_args(argc, argv, "12", &store, &cert, &chain); rb_scan_args(argc, argv, "12", &store, &cert, &chain);
GetX509StCtx(self, ctx); GetX509StCtx(self, ctx);
GetX509Store(store, x509st); GetX509Store(store, x509st);
if(!NIL_P(cert)) x509 = DupX509CertPtr(cert); /* NEED TO DUP */ if (!NIL_P(cert))
if(!NIL_P(chain)) x509s = ossl_x509_ary2sk(chain); x509 = DupX509CertPtr(cert); /* NEED TO DUP */
if(X509_STORE_CTX_init(ctx, x509st, x509, x509s) != 1){ if (!NIL_P(chain)) {
x509s = ossl_protect_x509_ary2sk(chain, &state);
if (state) {
X509_free(x509);
rb_jump_tag(state);
}
}
if (X509_STORE_CTX_init(ctx, x509st, x509, x509s) != 1){
X509_free(x509);
sk_X509_pop_free(x509s, X509_free); sk_X509_pop_free(x509s, X509_free);
ossl_raise(eX509StoreError, NULL); ossl_raise(eX509StoreError, "X509_STORE_CTX_init");
} }
if (!NIL_P(t = rb_iv_get(store, "@time"))) if (!NIL_P(t = rb_iv_get(store, "@time")))
ossl_x509stctx_set_time(self, t); ossl_x509stctx_set_time(self, t);