From 9c8d0265926d1785a82ee9cf6ad0b65e6e2f86ff Mon Sep 17 00:00:00 2001 From: Nathan Wang Date: Mon, 11 Sep 2023 10:55:59 -0700 Subject: [PATCH 1/2] check curl_easy_setopt return values for non-zero results --- src/traffic_top/stats.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/traffic_top/stats.h b/src/traffic_top/stats.h index ded9e673617..4aa7bc69c4e 100644 --- a/src/traffic_top/stats.h +++ b/src/traffic_top/stats.h @@ -326,9 +326,16 @@ class Stats curl = curl_easy_init(); if (curl) { - curl_easy_setopt(curl, CURLOPT_URL, _url.c_str()); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_error); + CURLcode url, function, buffer; + + url = curl_easy_setopt(curl, CURLOPT_URL, _url.c_str()); + function = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + buffer = curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_error); + + if (url | function | buffer != CURLE_OK) { + fprintf(stderr, "error setting curl 1 or more options. url: %d, function: %d, buffer: %d", url, function, buffer); + exit(1); + } // update time gettimeofday(&_time, nullptr); From b47254f86eaedf9aa05f73a724e887a1108f164f Mon Sep 17 00:00:00 2001 From: Nathan Wang Date: Mon, 11 Sep 2023 11:02:09 -0700 Subject: [PATCH 2/2] add parentheses around or statement --- src/traffic_top/stats.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/traffic_top/stats.h b/src/traffic_top/stats.h index 4aa7bc69c4e..037142b60c1 100644 --- a/src/traffic_top/stats.h +++ b/src/traffic_top/stats.h @@ -332,7 +332,7 @@ class Stats function = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); buffer = curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_error); - if (url | function | buffer != CURLE_OK) { + if ((url | function | buffer) != CURLE_OK) { fprintf(stderr, "error setting curl 1 or more options. url: %d, function: %d, buffer: %d", url, function, buffer); exit(1); }