diff options
| -rw-r--r-- | crypto/asn1/tasn_fre.c | 6 | ||||
| -rw-r--r-- | test/crltest.c | 23 |
2 files changed, 23 insertions, 6 deletions
diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c index 13aa6a728e..9035bc1b5c 100644 --- a/crypto/asn1/tasn_fre.c +++ b/crypto/asn1/tasn_fre.c @@ -85,8 +85,12 @@ void ossl_asn1_item_embed_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed case ASN1_ITYPE_NDEF_SEQUENCE: case ASN1_ITYPE_SEQUENCE: - if (ossl_asn1_do_lock(pval, -1, it) != 0) /* if error or ref-counter > 0 */ + if (ossl_asn1_do_lock(pval, -1, it) != 0) { + /* if error or ref-counter > 0 */ + OPENSSL_assert(embed == 0); + *pval = NULL; return; + } if (asn1_cb) { i = asn1_cb(ASN1_OP_FREE_PRE, pval, it, NULL); if (i == 2) diff --git a/test/crltest.c b/test/crltest.c index 76b53f46dc..fe686946ba 100644 --- a/test/crltest.c +++ b/test/crltest.c @@ -381,12 +381,24 @@ static int test_unknown_critical_crl(int n) static int test_reuse_crl(int idx) { X509_CRL *result, *reused_crl = CRL_from_strings(kBasicCRL); - char *p; - BIO *b = glue2bio(idx == 2 ? kRevokedCRL : kInvalidCRL + idx, &p); + X509_CRL *addref_crl = NULL; + char *p = NULL; + BIO *b = NULL; int r = 0; - if (!TEST_ptr(reused_crl) - || !TEST_ptr(b)) + if (!TEST_ptr(reused_crl)) + goto err; + + if (idx & 1) { + if (!TEST_true(X509_CRL_up_ref(reused_crl))) + goto err; + addref_crl = reused_crl; + } + + idx >>= 1; + b = glue2bio(idx == 2 ? kRevokedCRL : kInvalidCRL + idx, &p); + + if (!TEST_ptr(b)) goto err; result = PEM_read_bio_X509_CRL(b, &reused_crl, NULL, NULL); @@ -416,6 +428,7 @@ static int test_reuse_crl(int idx) OPENSSL_free(p); BIO_free(b); X509_CRL_free(reused_crl); + X509_CRL_free(addref_crl); return r; } @@ -430,7 +443,7 @@ int setup_tests(void) ADD_TEST(test_bad_issuer_crl); ADD_TEST(test_known_critical_crl); ADD_ALL_TESTS(test_unknown_critical_crl, OSSL_NELEM(unknown_critical_crls)); - ADD_ALL_TESTS(test_reuse_crl, 3); + ADD_ALL_TESTS(test_reuse_crl, 6); return 1; } |