[iortcw] 379/497: All: qcurl_multi_add_handle error check

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 0b2536d3c7c7445ec4ca5b9c38a74358a822b273
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sun Jul 26 15:02:54 2015 -0400

    All: qcurl_multi_add_handle error check
---
 MP/code/client/cl_curl.c | 8 +++++++-
 SP/code/client/cl_curl.c | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/MP/code/client/cl_curl.c b/MP/code/client/cl_curl.c
index 901ef99..9f186ae 100644
--- a/MP/code/client/cl_curl.c
+++ b/MP/code/client/cl_curl.c
@@ -211,6 +211,8 @@ static size_t CL_cURL_CallbackWrite(void *buffer, size_t size, size_t nmemb,
 
 void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
 {
+	CURLMcode result;
+
 	clc.cURLUsed = qtrue;
 	Com_Printf("URL: %s\n", remoteURL);
 	Com_DPrintf("***** CL_cURL_BeginDownload *****\n"
@@ -271,7 +273,11 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
 			"failed");
 		return;
 	}
-	qcurl_multi_add_handle(clc.downloadCURLM, clc.downloadCURL);
+	result = qcurl_multi_add_handle(clc.downloadCURLM, clc.downloadCURL);
+	if(result != CURLM_OK) {
+		Com_Error(ERR_DROP,"CL_cURL_BeginDownload: qcurl_multi_add_handle() failed: %s", qcurl_multi_strerror(result));
+		return;
+	}
 
 	if(!(clc.sv_allowDownload & DLF_NO_DISCONNECT) &&
 		!clc.cURLDisconnected) {
diff --git a/SP/code/client/cl_curl.c b/SP/code/client/cl_curl.c
index 901ef99..9f186ae 100644
--- a/SP/code/client/cl_curl.c
+++ b/SP/code/client/cl_curl.c
@@ -211,6 +211,8 @@ static size_t CL_cURL_CallbackWrite(void *buffer, size_t size, size_t nmemb,
 
 void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
 {
+	CURLMcode result;
+
 	clc.cURLUsed = qtrue;
 	Com_Printf("URL: %s\n", remoteURL);
 	Com_DPrintf("***** CL_cURL_BeginDownload *****\n"
@@ -271,7 +273,11 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
 			"failed");
 		return;
 	}
-	qcurl_multi_add_handle(clc.downloadCURLM, clc.downloadCURL);
+	result = qcurl_multi_add_handle(clc.downloadCURLM, clc.downloadCURL);
+	if(result != CURLM_OK) {
+		Com_Error(ERR_DROP,"CL_cURL_BeginDownload: qcurl_multi_add_handle() failed: %s", qcurl_multi_strerror(result));
+		return;
+	}
 
 	if(!(clc.sv_allowDownload & DLF_NO_DISCONNECT) &&
 		!clc.cURLDisconnected) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git