]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
ssl: Remove shadowed variable in write retry path master
authorMounir IDRASSI <mounir.idrassi@idrix.fr>
Mon, 3 Aug 2026 13:47:08 +0000 (22:47 +0900)
committerEugene Syromiatnikov <esyr@openssl.org>
Mon, 3 Aug 2026 15:45:51 +0000 (17:45 +0200)
Commit 5f3db0d81132 "Fix false success on zero BIO write" introduced
a function-scope left variable while the app-buffer recovery block
already declared one.  This breaks builds using -Werror=shadow.

Assign the current buffer length to the existing function-scope variable
in the recovery block.  This preserves the previous re-read at that point
while eliminating the shadowed declaration.

Fixes: 5f3db0d81132 "Fix false success on zero BIO write"
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Andrew Dinh <andrewd@openssl.org>
Reviewed-by: Jakub Zelenka <jakub.zelenka@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Mon Aug  3 15:46:22 2026
(Merged from https://github.com/openssl/openssl/pull/32153)

ssl/record/methods/tls_common.c

index 36304496e836c27a0f0023ea465d3a6ba06254c8..f895f942a667001e670f246fd54e21832fed0dc5 100644 (file)
@@ -1924,9 +1924,9 @@ int tls_retry_write_records(OSSL_RECORD_LAYER *rl)
              */
             if (TLS_BUFFER_is_app_buffer(thiswb)
                 && (rl->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER) != 0) {
-                size_t left = TLS_BUFFER_get_left(thiswb);
                 unsigned char *buf;
 
+                left = TLS_BUFFER_get_left(thiswb);
                 buf = OPENSSL_malloc(left);
                 if (buf == NULL) {
                     RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);