mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 03:54:14 +08:00
txp_generate_stream_frames(): Set stream id in header early enough
Otherwise we will calculate an incorrect header size for higher stream ids and won't fit the frame into the packet. Fixes #25417 Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25928)
This commit is contained in:
parent
dd73b45e28
commit
ba6f115ccf
@ -2226,6 +2226,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
|
||||
rc = 1;
|
||||
goto err;
|
||||
}
|
||||
chunks[i].shdr.stream_id = id;
|
||||
}
|
||||
|
||||
for (i = 0;; ++i) {
|
||||
@ -2339,7 +2340,6 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
|
||||
if (wpkt == NULL)
|
||||
goto err; /* alloc error */
|
||||
|
||||
shdr->stream_id = id;
|
||||
if (!ossl_assert(ossl_quic_wire_encode_frame_stream_hdr(wpkt, shdr))) {
|
||||
/* (Should not be possible.) */
|
||||
tx_helper_rollback(h);
|
||||
|
Loading…
Reference in New Issue
Block a user