Minor fixes

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

diff --git a/ssl/quic/qlog.c b/ssl/quic/qlog.c
index e35c7d7b63c78fda58a70d746cfb322007811896..7299d695153bb48576b3aacf7a07e8359bce8d50 100644 (file)
--- a/ssl/quic/qlog.c
+++ b/ssl/quic/qlog.c
@@ -162,8 +162,7 @@ void ossl_qlog_free(QLOG *qlog)
     if (qlog == NULL)
         return;
 
-    ossl_json_flush(&qlog->json);
-    ossl_json_cleanup(&qlog->json);
+    ossl_json_flush_cleanup(&qlog->json);
     BIO_free_all(qlog->bio);
     OPENSSL_free((char *)qlog->info.title);
     OPENSSL_free((char *)qlog->info.description);

diff --git a/test/json_test.c b/test/json_test.c
index 97ab9aa646d67bf6f0d59e8727af50e8d9e94fe4..d2c50597190513ab2dde386e38052465ecd805e4 100644 (file)
--- a/test/json_test.c
+++ b/test/json_test.c
@@ -43,7 +43,7 @@ static void helper_cleanup(struct helper *h)
     BIO_free_all(h->mem_bio);
     h->mem_bio = NULL;
 
-    if (!h->init) {
+    if (h->init) {
         ossl_json_cleanup(&h->j);
         h->init = 0;
     }