From d10f1c29f9afebab34150f6b4ab45748e3af2c8d Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 22 Jul 2023 20:37:27 +0200 Subject: [PATCH] [curl] Do not check conn->cached twice if not NULL --- src/protocol/curl/ftp.c | 9 ++++++--- src/protocol/curl/http.c | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/protocol/curl/ftp.c b/src/protocol/curl/ftp.c index 7ff8c45a..e56e329a 100644 --- a/src/protocol/curl/ftp.c +++ b/src/protocol/curl/ftp.c @@ -493,11 +493,14 @@ ftpes_got_data(void *stream, void *buf, size_t len) /* XXX: This probably belongs rather to connect.c ? */ set_connection_timeout(conn); - if (!conn->cached) conn->cached = get_cache_entry(conn->uri); if (!conn->cached) { + conn->cached = get_cache_entry(conn->uri); + + if (!conn->cached) { out_of_mem: - abort_connection(conn, connection_state(S_OUT_OF_MEM)); - return; + abort_connection(conn, connection_state(S_OUT_OF_MEM)); + return; + } } if (len < 0) { diff --git a/src/protocol/curl/http.c b/src/protocol/curl/http.c index c5273b55..6dda5e0f 100644 --- a/src/protocol/curl/http.c +++ b/src/protocol/curl/http.c @@ -305,10 +305,13 @@ http_curl_got_header(void *stream, void *buf, size_t len) char *buffer = (char *)buf; struct http_curl_connection_info *http = (struct http_curl_connection_info *)conn->info; - if (!conn->cached) conn->cached = get_cache_entry(conn->uri); if (!conn->cached) { - abort_connection(conn, connection_state(S_OUT_OF_MEM)); - return; + conn->cached = get_cache_entry(conn->uri); + + if (!conn->cached) { + abort_connection(conn, connection_state(S_OUT_OF_MEM)); + return; + } } if (len < 0) { @@ -333,10 +336,13 @@ http_got_data(void *stream, void *buf, size_t len) char *buffer = (char *)buf; struct http_curl_connection_info *http = (struct http_curl_connection_info *)conn->info; - if (!conn->cached) conn->cached = get_cache_entry(conn->uri); if (!conn->cached) { - abort_connection(conn, connection_state(S_OUT_OF_MEM)); - return; + conn->cached = get_cache_entry(conn->uri); + + if (!conn->cached) { + abort_connection(conn, connection_state(S_OUT_OF_MEM)); + return; + } } if (len < 0) {