From: Hugo Landau <hlandau@openssl.org>
Date: Fri, 28 Apr 2023 14:48:44 +0000 (+0100)
Subject: Minor fixups
X-Git-Tag: openssl-3.2.0-alpha1~926
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb7f3701cecb49ca0faacb5e46d11fd07cf2ee02;p=thirdparty%2Fopenssl.git

Minor fixups

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20423)
---

diff --git a/ssl/quic/quic_ackm.c b/ssl/quic/quic_ackm.c
index f7986728f6c..7478d5fc24c 100644
--- a/ssl/quic/quic_ackm.c
+++ b/ssl/quic/quic_ackm.c
@@ -990,11 +990,12 @@ static void ackm_on_pkts_acked(OSSL_ACKM *ackm, const OSSL_ACKM_TX_PKT *apkt)
                                               apkt->largest_acked + 1);
         }
 
+        ainfo.tx_time = apkt->time;
+        ainfo.tx_size = apkt->num_bytes;
+
         anext = apkt->anext;
         apkt->on_acked(apkt->cb_arg); /* may free apkt */
 
-        ainfo.tx_time = apkt->time;
-        ainfo.tx_size = apkt->num_bytes;
         ackm->cc_method->on_data_acked(ackm->cc_data, &ainfo);
     }
 }
diff --git a/test/quic_cc_test.c b/test/quic_cc_test.c
index ce2507e68d3..8d75a642c84 100644
--- a/test/quic_cc_test.c
+++ b/test/quic_cc_test.c
@@ -592,7 +592,7 @@ static int test_sanity(void)
     if (!TEST_uint64_t_ne(ccm->get_tx_allowance(cc), allowance2))
         goto err;
 
-    /* But it should not be as high as the origina value */
+    /* But it should not be as high as the original value */
     if (!TEST_uint64_t_lt(ccm->get_tx_allowance(cc), allowance))
         goto err;