From 281bf90c10d00ffb4941944f423326b78a9563cc Mon Sep 17 00:00:00 2001 From: zhaoxiaomeng Date: Tue, 29 Nov 2022 15:29:25 +0800 Subject: [PATCH] Revert "append" This reverts commit 5ad868428a127a5d3187676eb3bd2298b441a71a. --- src/tls.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/tls.c b/src/tls.c index 2c6af924..980cdcde 100644 --- a/src/tls.c +++ b/src/tls.c @@ -1450,19 +1450,22 @@ int tls_record_do_recv(uint8_t *record, size_t *recordlen, tls_socket_t sock) { len = 5; while (len) { - while (r = tls_socket_recv(sock, record + 5 - len, len, 0)) { + while ((r = tls_socket_recv(sock, record + 5 - len, len, 0)) < 0) { if (errno == EAGAIN) { continue; - } else if (r < 0) { + } else { error_print(); return -1; - } else { - perror("tls_record_do_recv"); - error_print(); - return 0; } } + error_print(); + if (r == 0) { + perror("tls_record_do_recv"); + error_print(); + return 0; + } + len -= r; } if (!tls_record_type_name(tls_record_type(record))) {