From 5600364f4aeaa078508b3e6aba030e6232c55b8f Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Fri, 8 Nov 2024 15:18:05 -0600 Subject: Change some more out of memory errors --- libressl.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libressl.patch b/libressl.patch index 3185e93..dea23ad 100644 --- a/libressl.patch +++ b/libressl.patch @@ -135,7 +135,7 @@ index 9f1dd67ec..7e8da6df2 100644 static void tls_xwrite(tls_state_t *tls, int len) { diff --git a/networking/wget.c b/networking/wget.c -index 6a64836fb..cb625b9fc 100644 +index 6a64836fb..334becc47 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void) @@ -146,7 +146,7 @@ index 6a64836fb..cb625b9fc 100644 static int spawn_https_helper_openssl(const char *host, unsigned port) { char *allocated = NULL; -@@ -777,6 +778,34 @@ static int spawn_https_helper_openssl(const char *host, unsigned port) +@@ -777,6 +778,35 @@ static int spawn_https_helper_openssl(const char *host, unsigned port) # endif return sp[0]; } @@ -155,7 +155,6 @@ index 6a64836fb..cb625b9fc 100644 +static int spawn_https_helper_openssl(const char *host, unsigned port) +{ + char* allocated = NULL; -+ int fd1; + char *servername, *p, *cmd; + int sp[2]; + if(!strchr(host,":")) @@ -165,14 +164,16 @@ index 6a64836fb..cb625b9fc 100644 + + struct tls *ctx = tls_client(); + if(ctx == NULL) -+ bb_error_msg_and_die("Out of memory"); ++ bb_error_msg_and_die("Out of memory 1"); + struct tls_config *config = tls_config_new(); + if(config == NULL) -+ bb_error_msg_and_die("Out of memory"); ++ bb_error_msg_and_die(tls_config_error()); + if(tls_configure(ctx,config) != 0) + bb_error_msg_and_die("Failed to configure client"); + tls_connect_fds(ctx,sp[0],sp[1],servername); + close(sp[1]); ++ tls_config_free(config); ++ tls_free(ctx) + free(allocated); + free(servername); + return sp[0]; -- cgit v1.2.3-55-g6feb