summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2012-11-30 14:46:43 +0100
committerDaniel Stenberg <daniel@haxx.se>2012-12-11 23:31:17 +0100
commitbf8130ac64a24f62a2df76faafe37c9323dd50fb (patch)
treef661d991f8f38673b3fbad364637c5dfbd139542
parent4675ab7c81e2bea5f4d15fc2ea4bad29f3d4b0a4 (diff)
downloadcurl-bf8130ac64a24f62a2df76faafe37c9323dd50fb.tar.gz
curl_easy_perform: only access 'still_running' if OK
-rw-r--r--lib/easy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/easy.c b/lib/easy.c
index e075d79c4..265b44dc2 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -453,7 +453,8 @@ CURLcode curl_easy_perform(CURL *easy)
if(mcode == CURLM_OK)
mcode = curl_multi_perform(multi, &still_running);
- if(!still_running) {
+ /* only read 'still_running' if curl_multi_perform() return OK */
+ if((mcode == CURLM_OK) && !still_running) {
msg = curl_multi_info_read(multi, &rc);
if(msg) {
code = msg->data.result;