From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 29 Jan 2024 14:49:09 +0000 (+0000)
Subject: Minor fixes
X-Git-Tag: openssl-3.3.0-alpha1~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cc04b777dd7febf767e4dcbd4ace014d5521f47;p=thirdparty%2Fopenssl.git

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 e35c7d7b63c..7299d695153 100644
--- 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 97ab9aa646d..d2c50597190 100644
--- 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;
     }