feat:1.12.19, 使用StringTo()优化工程中已有代码

Author: hevake

modules/http/server/request_parser.cpp

@@ -22,6 +22,7 @@
 #include <tbox/base/defines.h>
 #include <tbox/base/log.h>
 #include <tbox/util/string.h>
+#include <tbox/util/string_to.h>
 
 namespace tbox {
 namespace http {
@@ -139,8 +140,13 @@ size_t RequestParser::parse(const void *data_ptr, size_t data_size)
                 auto head_value = util::string::Strip(str.substr(head_value_start_pos, head_value_end_pos - head_value_start_pos));
                 sp_request_->headers[head_key] = head_value;
 
-                if (head_key == "Content-Length")
-                    content_length_ = std::stoi(head_value);
+                if (head_key == "Content-Length") {
+                    if (!util::StringTo(head_value, content_length_)) {
+                        LogNotice("Content-Length should be number");
+                        state_ = State::kFail;
+                        return pos;
+                    }
+                }
 
             } else {
                 sp_request_->headers[head_key] = "";

modules/network/sockaddr.cpp

@@ -22,6 +22,8 @@
 #include <arpa/inet.h>
 
 #include <tbox/base/log.h>
+#include <tbox/util/string_to.h>
+
 #include <sstream>
 
 #include "sockaddr.h"
@@ -99,10 +101,10 @@ SockAddr SockAddr::FromString(const string &addr_str)
         auto ipv4_str = addr_str.substr(0, colon_pos) ;
         auto port_str = addr_str.substr(colon_pos + 1) ;
 
-        try {
-            uint16_t port = stoi(port_str);
+        uint16_t port = 0;
+        if (util::StringTo(port_str, port)) {
             return SockAddr(IPAddress::FromString(ipv4_str), port);
-        } catch (const std::exception &e) {
+        } else {
             return SockAddr();
         }
     } else {

modules/network/uart.cpp

@@ -23,6 +23,7 @@
 #include <fcntl.h>
 
 #include <tbox/base/log.h>
+#include <tbox/util/string_to.h>
 
 namespace tbox {
 namespace network {
@@ -233,7 +234,10 @@ bool Uart::setMode(const std::string &mode_str)
     Mode mode;
 
     //! 波特率
-    mode.baudrate = stoi(baudrate_str);
+    if (!util::StringTo(baudrate_str, mode.baudrate)) {
+        LogErr("baudrate must be number");
+        return false;
+    }
 
     //! 数据位
     if (data_bits_ch == '8')

modules/terminal/impl/terminal_commands.cpp

@@ -25,6 +25,7 @@
 #include <tbox/base/log.h>
 #include <tbox/util/split_cmdline.h>
 #include <tbox/util/string.h>
+#include <tbox/util/string_to.h>
 #include <tbox/event/loop.h>
 
 #include "session_context.h"
@@ -336,8 +337,9 @@ bool Terminal::Impl::executeRunHistoryCmd(SessionContext *s, const Args &args)
         return execute(s);
     }
 
-    try {
-        auto index = std::stoi(sub_cmd);
+    size_t index = 0;
+
+    if (util::StringTo(sub_cmd, index)) {
         bool is_index_valid = false;
         if (index >= 0) {
             if (static_cast<size_t>(index) < s->history.size()) {
@@ -356,7 +358,8 @@ bool Terminal::Impl::executeRunHistoryCmd(SessionContext *s, const Args &args)
             return execute(s);
         } else
             s->wp_conn->send(s->token, "Error: index out of range.\r\n");
-    } catch (const invalid_argument &e) {
+
+    } else {
         s->wp_conn->send(s->token, "Error: parse index fail.\r\n");
     }
 

modules/util/string_to.cpp

@@ -114,6 +114,56 @@ bool StringTo(const std::string &text, unsigned long long &value, int base)
     TO_NUMBER_WITH_BASE(std::stoull);
 }
 
+#if __SIZEOF_INT__ > 4
+bool StringTo(const std::string &text, uint32_t &value, int base)
+{
+    uint64_t tmp;
+
+    if (StringTo(text, tmp, base)) {
+        if (tmp < 0x100000000lu) {
+            value = static_cast<uint32_t>(tmp);
+            return true;
+        } else {
+            LogWarn("number overflow, %u > 0xffffffff", tmp);
+        }
+    }
+
+    return false;
+}
+#endif
+
+bool StringTo(const std::string &text, uint16_t &value, int base)
+{
+    uint32_t tmp;
+
+    if (StringTo(text, tmp, base)) {
+        if (tmp < 0x10000u) {
+            value = static_cast<uint16_t>(tmp);
+            return true;
+        } else {
+            LogWarn("number overflow, %u > 0xffff", tmp);
+        }
+    }
+
+    return false;
+}
+
+bool StringTo(const std::string &text, uint8_t &value, int base)
+{
+    uint16_t tmp;
+
+    if (StringTo(text, tmp, base)) {
+        if (tmp < 0x100u) {
+            value = static_cast<uint8_t>(tmp);
+            return true;
+        } else {
+            LogWarn("number overflow, %u > 0xff", tmp);
+        }
+    }
+
+    return false;
+}
+
 bool StringTo(const std::string &text, float &value)
 {
     TO_NUMBER(std::stof);

modules/util/string_to.h

@@ -50,6 +50,12 @@ bool StringTo(const std::string &text, unsigned int &value, int base = 10);  //!
 bool StringTo(const std::string &text, unsigned long &value, int base = 10);  //! 解析unsigned long值
 bool StringTo(const std::string &text, unsigned long long &value, int base = 10);  //! 解析unsigned long long值
 
+#if __SIZEOF_INT__ > 4
+bool StringTo(const std::string &text, uint32_t &value, int base = 10);  //! 解析uint32值
+#endif
+bool StringTo(const std::string &text, uint16_t &value, int base = 10);  //! 解析uint16值
+bool StringTo(const std::string &text, uint8_t &value, int base = 10);   //! 解析uint8值
+
 bool StringTo(const std::string &text, float &value);   //! 解析float值
 bool StringTo(const std::string &text, double &value);  //! 解析double值
 

modules/util/string_to_test.cpp

@@ -109,6 +109,32 @@ TEST(StringTo, long)
     EXPECT_FALSE(StringTo("", value));
 }
 
+TEST(StringTo, uint16_t)
+{
+    uint16_t value = 0;
+    EXPECT_TRUE(StringTo("12345", value));
+    EXPECT_EQ(value, 12345);
+
+    EXPECT_TRUE(StringTo("0xFFFF", value, 16));
+    EXPECT_EQ(value, 0xFFFF);
+
+    EXPECT_FALSE(StringTo("0x10000", value, 16));
+    EXPECT_FALSE(StringTo("65536", value));
+}
+
+TEST(StringTo, uint8_t)
+{
+    uint8_t value = 0;
+    EXPECT_TRUE(StringTo("123", value));
+    EXPECT_EQ(value, 123);
+
+    EXPECT_TRUE(StringTo("0xFF", value, 16));
+    EXPECT_EQ(value, 0xFF);
+
+    EXPECT_FALSE(StringTo("0x100", value, 16));
+    EXPECT_FALSE(StringTo("256", value));
+}
+
 TEST(StringTo, Double)
 {
     double value = -1;

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 12
-TBOX_VERSION_REVISION := 18
+TBOX_VERSION_REVISION := 19