Change atoi to ParseInt

Author: jamescowens

src/gridcoin/staking/kernel.cpp

@@ -140,7 +140,7 @@ int64_t GetRSAWeightByBlock(const std::string& bb)
     constexpr size_t rsa_weight_offset = 13;
     constexpr size_t magnitude_offset = 15;
 
-    int64_t rsa_weight = 0;
+    int64_t rsa_weight_sum = 0;
 
     // General-purpose deserialization of claim contexts in the hashBoinc field
     // no longer parses out the RSA weight field, so we handle the special case
@@ -154,18 +154,25 @@ int64_t GetRSAWeightByBlock(const std::string& bb)
         if (n == cpid_offset && end - offset != 32) {
             return 0;
         } else if (n == rsa_weight_offset || n == magnitude_offset) {
-            rsa_weight += std::atoi(bb.substr(offset, end - offset).c_str());
+            int64_t rsa_weight = 0;
+
+            if (!ParseInt64(bb.substr(offset, end - offset), &rsa_weight)) {
+                error("%s: Unable to parse rsa weight from hashBoinc.", __func__);
+                rsa_weight = 0;
+            }
+
+            rsa_weight_sum += rsa_weight;
         }
 
         offset = end + 3;
         end = bb.find("<|>", offset);
     }
 
-    if (rsa_weight < 0) {
+    if (rsa_weight_sum < 0) {
         return 0;
     }
 
-    return rsa_weight;
+    return rsa_weight_sum;
 }
 } // anonymous namespace
 

src/rpc/protocol.cpp

@@ -114,8 +114,9 @@ int ReadHTTPHeaders(std::basic_istream<char>& stream, std::map<std::string, std:
             std::string strValue = str.substr(nColon+1);
             boost::trim(strValue);
             mapHeadersRet[strHeader] = strValue;
-            if (strHeader == "content-length")
-                nLen = atoi(strValue.c_str());
+            if (strHeader == "content-length" && !ParseInt(strValue, &nLen)) {
+                throw std::invalid_argument("Unable to parse content-length value.");
+            }
         }
     }
     return nLen;
@@ -150,8 +151,9 @@ bool ReadHTTPRequestLine(std::basic_istream<char>& stream, int &proto,
 
     proto = 0;
     const char *ver = strstr(strProto.c_str(), "HTTP/1.");
-    if (ver != nullptr)
-        proto = atoi(ver+7);
+    if (ver != nullptr && !ParseInt(std::string(ver+7), &proto)) {
+        throw std::invalid_argument("Unable to parse proto.");
+    }
 
     return true;
 }
@@ -166,9 +168,15 @@ int ReadHTTPStatus(std::basic_istream<char>& stream, int &proto)
         return HTTP_INTERNAL_SERVER_ERROR;
     proto = 0;
     const char *ver = strstr(str.c_str(), "HTTP/1.");
-    if (ver != nullptr)
-        proto = atoi(ver+7);
-    return atoi(vWords[1].c_str());
+    if (ver != nullptr && !ParseInt(std::string(ver+7), &proto)) {
+        throw std::invalid_argument("Unable to parse proto.");
+    }
+
+    int status = 0;
+    if (!ParseInt(vWords[1], &status)) {
+        throw std::invalid_argument("Unable to parse status.");
+    }
+    return status;
 }
 
 int ReadHTTPMessage(std::basic_istream<char>& stream, std::map<std::string,

src/test/gridcoin/superblock_tests.cpp

@@ -78,7 +78,11 @@ struct Legacy
         }
 
         // Append zero magnitude researchers so the beacon count matches
-        int num_zero_mag = atoi(ExtractXML(sBlock,"<ZERO>","</ZERO>"));
+        int num_zero_mag = 0;
+        if (!ParseInt(ExtractXML(sBlock,"<ZERO>","</ZERO>"), &num_zero_mag)) {
+            error("%s: Unable to parse number of zero magnitude researchers from legary binary superblock data.",
+                  __func__);
+        };
         const std::string zero_entry("0,15;");
         for(int i=0; i<num_zero_mag; ++i)
             stream << zero_entry;

src/util/system.cpp

@@ -72,7 +72,14 @@ static bool InterpretBool(const std::string& strValue)
 {
     if (strValue.empty())
         return true;
-    return (atoi(strValue) != 0);
+
+    // Maintaining the behavior as described above, but replacing the atoi with ParseInt.
+    int value = 0;
+    if (!ParseInt(strValue, &value)) {
+        value = 0;
+    }
+
+    return (value);
 }
 
 static std::string SettingName(const std::string& arg)