Merge pull request #74 from GregThain/static-analysis

Fix minor complaints found by static analysis

Author: djw8605

src/scitokens.cpp

@@ -140,7 +140,7 @@ int scitoken_get_claim_string_list(const SciToken token, const char *key, char *
         if (err_msg) {*err_msg = strdup(exc.what());}
         return -1;
     }
-    auto claim_list_c = static_cast<char **>(malloc(sizeof(char **) * (claim_list.size() + 1)));
+    auto claim_list_c = static_cast<char **>(malloc(sizeof(char *) * (claim_list.size() + 1)));
     claim_list_c[claim_list.size()] = nullptr;
     int idx = 0;
     for (const auto &entry : claim_list) {

src/scitokens_cache.cpp

@@ -69,18 +69,15 @@ get_cache_file() {
         return "";
     }
 
-    struct stat cache_dir_stat;
-    if (-1 == stat(cache_dir.c_str(), &cache_dir_stat)) {
-        if (errno == ENOENT) {
-            if (-1 == mkdir(cache_dir.c_str(), 0700)) return "";
-        }
+    int r = mkdir(cache_dir.c_str(), 0700);
+    if ((r < 0) && errno != EEXIST) {
+        return "";
     }
 
     std::string keycache_dir = cache_dir + "/scitokens";
-    if (-1 == stat(keycache_dir.c_str(), &cache_dir_stat)) {
-        if (errno == ENOENT) {
-            if (-1 == mkdir(keycache_dir.c_str(), 0700)) return "";
-        }
+    r = mkdir(keycache_dir.c_str(), 0700);
+    if ((r < 0) && errno != EEXIST) {
+        return "";
     }
 
     std::string keycache_file = keycache_dir + "/scitokens_cpp.sqllite";

src/scitokens_internal.cpp

@@ -42,7 +42,7 @@ class SimpleCurlGet {
 
         auto curl = curl_easy_init();
         if (!curl) {
-            CurlException("Failed to create a new curl handle.");
+            throw CurlException("Failed to create a new curl handle.");
         }
 
         if (m_maxbytes > 0) {
@@ -52,9 +52,18 @@ class SimpleCurlGet {
             }
         }
 
-        curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &write_data);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
+        CURLcode rv = curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+        if (rv != CURLE_OK) {
+            throw CurlException("Failed to set CURLOPT_URL.");
+        }
+        rv = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &write_data);
+        if (rv != CURLE_OK) {
+            throw CurlException("Failed to set CURLOPT_WRITEFUNCTION.");
+        }
+        rv = curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
+        if (rv != CURLE_OK) {
+            throw CurlException("Failed to set CURLOPT_WRITEDATA.");
+        }
 
         auto res = curl_easy_perform(curl);
         if (res != CURLE_OK) {