From 0311ac9d8368acd5baac8b7fc6f753bd895ea3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Tue, 6 Oct 2020 13:32:19 +0200
Subject: [PATCH 1/2] Fix Coverity warnings

Addressing multiple Coverity defects similar to this one:
Defect type: CHECKED_RETURN
check_return: Calling "curl_easy_setopt(curl, _curl_opt, _curl_trace)"
without checking return value. This library function may fail and return
an error code.
---
 src/common/oscap_acquire.c | 65 +++++++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/common/oscap_acquire.c b/src/common/oscap_acquire.c
index 666f4f5c9..34a92fa19 100644
--- a/src/common/oscap_acquire.c
+++ b/src/common/oscap_acquire.c
@@ -326,18 +326,59 @@ char* oscap_acquire_url_download(const char *url, size_t* memory_size)
 		return NULL;
 	}
 
-	struct oscap_buffer* buffer = oscap_buffer_new();
-
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_to_memory_callback);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer);
-	curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "");
-	curl_easy_setopt(curl, CURLOPT_TRANSFER_ENCODING, true);
-	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true);
-	curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
-	curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, _curl_trace);
-
-	CURLcode res = curl_easy_perform(curl);
+	CURLcode res;
+
+	res = curl_easy_setopt(curl, CURLOPT_URL, url);
+	if (res != 0) {
+		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_URL to '%s': %s", url, curl_easy_strerror(res));
+		return NULL;
+	}
+
+	res = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_to_memory_callback);
+	if (res != 0) {
+		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_WRITEFUNCTION to write_to_memory_callback: %s", curl_easy_strerror(res));
+		return NULL;
+	}
+
+	res = curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "");
+	if (res != 0) {
+		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_ACCEPT_ENCODING to an empty string: %s", curl_easy_strerror(res));
+		return NULL;
+	}
+
+	res = curl_easy_setopt(curl, CURLOPT_TRANSFER_ENCODING, true);
+	if (res != 0) {
+		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_TRANSFER_ENCODING to true: %s", curl_easy_strerror(res));
+		return NULL;
+	}
+
+	res = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true);
+	if (res != 0) {
+		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_FOLLOWLOCATION to true: %s", curl_easy_strerror(res));
+		return NULL;
+	}
+
+	res = curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
+	if (res != 0) {
+		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_VERBOSE to true: %s", curl_easy_strerror(res));
+		return NULL;
+	}
+
+	res = curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, _curl_trace);
+	if (res != 0) {
+		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_DEBUGFUNCTION to _curl_trace: %s", curl_easy_strerror(res));
+		return NULL;
+	}
+
+	struct oscap_buffer *buffer = oscap_buffer_new();
+	res = curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer);
+	if (res != 0) {
+		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_WRITEDATA as buffer: %s", curl_easy_strerror(res));
+		oscap_buffer_free(buffer);
+		return NULL;
+	}
+
+	res = curl_easy_perform(curl);
 	curl_easy_cleanup(curl);
 
 	if (res != 0) {

From 34af1348b6ff6e4710aeb6e383b1a50c4751c16e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Mon, 26 Oct 2020 11:12:04 +0100
Subject: [PATCH 2/2] Add curl_easy_cleanup everywhere

---
 src/common/oscap_acquire.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/common/oscap_acquire.c b/src/common/oscap_acquire.c
index 34a92fa19..cd9bfc36f 100644
--- a/src/common/oscap_acquire.c
+++ b/src/common/oscap_acquire.c
@@ -330,42 +330,49 @@ char* oscap_acquire_url_download(const char *url, size_t* memory_size)
 
 	res = curl_easy_setopt(curl, CURLOPT_URL, url);
 	if (res != 0) {
+		curl_easy_cleanup(curl);
 		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_URL to '%s': %s", url, curl_easy_strerror(res));
 		return NULL;
 	}
 
 	res = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_to_memory_callback);
 	if (res != 0) {
+		curl_easy_cleanup(curl);
 		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_WRITEFUNCTION to write_to_memory_callback: %s", curl_easy_strerror(res));
 		return NULL;
 	}
 
 	res = curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "");
 	if (res != 0) {
+		curl_easy_cleanup(curl);
 		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_ACCEPT_ENCODING to an empty string: %s", curl_easy_strerror(res));
 		return NULL;
 	}
 
 	res = curl_easy_setopt(curl, CURLOPT_TRANSFER_ENCODING, true);
 	if (res != 0) {
+		curl_easy_cleanup(curl);
 		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_TRANSFER_ENCODING to true: %s", curl_easy_strerror(res));
 		return NULL;
 	}
 
 	res = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true);
 	if (res != 0) {
+		curl_easy_cleanup(curl);
 		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_FOLLOWLOCATION to true: %s", curl_easy_strerror(res));
 		return NULL;
 	}
 
 	res = curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
 	if (res != 0) {
+		curl_easy_cleanup(curl);
 		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_VERBOSE to true: %s", curl_easy_strerror(res));
 		return NULL;
 	}
 
 	res = curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, _curl_trace);
 	if (res != 0) {
+		curl_easy_cleanup(curl);
 		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_DEBUGFUNCTION to _curl_trace: %s", curl_easy_strerror(res));
 		return NULL;
 	}
@@ -373,6 +380,7 @@ char* oscap_acquire_url_download(const char *url, size_t* memory_size)
 	struct oscap_buffer *buffer = oscap_buffer_new();
 	res = curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer);
 	if (res != 0) {
+		curl_easy_cleanup(curl);
 		oscap_seterr(OSCAP_EFAMILY_NET, "Failed to set CURLOPT_WRITEDATA as buffer: %s", curl_easy_strerror(res));
 		oscap_buffer_free(buffer);
 		return NULL;