From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 29 Jan 2024 12:37:35 +0000 (+0000)
Subject: QLOG: Fix filter lexing
X-Git-Tag: openssl-3.3.0-alpha1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c067dcb2c06278ea528f39337a405181df4a5cf;p=thirdparty%2Fopenssl.git

QLOG: Fix filter lexing

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 e084d47ac7c..6944a4f435d 100644
--- a/ssl/quic/qlog.c
+++ b/ssl/quic/qlog.c
@@ -155,6 +155,7 @@ void ossl_qlog_free(QLOG *qlog)
     if (qlog == NULL)
         return;
 
+    ossl_json_flush(&qlog->json);
     ossl_json_cleanup(&qlog->json);
     BIO_free_all(qlog->bio);
     OPENSSL_free((char *)qlog->info.title);
@@ -573,7 +574,7 @@ static int lex_extract_to(struct lexer *lex, char c,
         return 0;
 
     *str    = p;
-    *str_l  = term_end - s;
+    *str_l  = s - p;
     lex->p  = ++s;
     return 1;
 }