Check integer conversion errors when reading TP from file

ngtcp2 · Mar 7, 2021 · 2381f7f · 2381f7f
1 parent 9ebb55e
commit 2381f7f
Showing 1 changed file with 62 additions and 21 deletions.
diff --git a/examples/client_base.cc b/examples/client_base.cc
@@ -93,27 +93,68 @@ int ClientBase::read_transport_params(const char *path,
 
   for (std::string line; std::getline(f, line);) {
     if (util::istarts_with_l(line, "initial_max_streams_bidi=")) {
-      params->initial_max_streams_bidi = strtoul(
-          line.c_str() + str_size("initial_max_streams_bidi="), nullptr, 10);
-    } else if (util::istarts_with_l(line, "initial_max_streams_uni=")) {
-      params->initial_max_streams_uni = strtoul(
-          line.c_str() + str_size("initial_max_streams_uni="), nullptr, 10);
-    } else if (util::istarts_with_l(line,
-                                    "initial_max_stream_data_bidi_local=")) {
-      params->initial_max_stream_data_bidi_local = strtoul(
-          line.c_str() + str_size("initial_max_stream_data_bidi_local="),
-          nullptr, 10);
-    } else if (util::istarts_with_l(line,
-                                    "initial_max_stream_data_bidi_remote=")) {
-      params->initial_max_stream_data_bidi_remote = strtoul(
-          line.c_str() + str_size("initial_max_stream_data_bidi_remote="),
-          nullptr, 10);
-    } else if (util::istarts_with_l(line, "initial_max_stream_data_uni=")) {
-      params->initial_max_stream_data_uni = strtoul(
-          line.c_str() + str_size("initial_max_stream_data_uni="), nullptr, 10);
-    } else if (util::istarts_with_l(line, "initial_max_data=")) {
-      params->initial_max_data =
-          strtoul(line.c_str() + str_size("initial_max_data="), nullptr, 10);
+      if (auto n = util::parse_uint(line.c_str() +
+                                    str_size("initial_max_streams_bidi="));
+          !n) {
+        return -1;
+      } else {
+        params->initial_max_streams_bidi = *n;
+      }
+      continue;
+    }
+
+    if (util::istarts_with_l(line, "initial_max_streams_uni=")) {
+      if (auto n = util::parse_uint(line.c_str() +
+                                    str_size("initial_max_streams_uni="));
+          !n) {
+        return -1;
+      } else {
+        params->initial_max_streams_uni = *n;
+      }
+      continue;
+    }
+
+    if (util::istarts_with_l(line, "initial_max_stream_data_bidi_local=")) {
+      if (auto n = util::parse_uint(
+              line.c_str() + str_size("initial_max_stream_data_bidi_local="));
+          !n) {
+        return -1;
+      } else {
+        params->initial_max_stream_data_bidi_local = *n;
+      }
+      continue;
+    }
+
+    if (util::istarts_with_l(line, "initial_max_stream_data_bidi_remote=")) {
+      if (auto n = util::parse_uint(
+              line.c_str() + str_size("initial_max_stream_data_bidi_remote="));
+          !n) {
+        return -1;
+      } else {
+        params->initial_max_stream_data_bidi_remote = *n;
+      }
+      continue;
+    }
+
+    if (util::istarts_with_l(line, "initial_max_stream_data_uni=")) {
+      if (auto n = util::parse_uint(line.c_str() +
+                                    str_size("initial_max_stream_data_uni="));
+          !n) {
+        return -1;
+      } else {
+        params->initial_max_stream_data_uni = *n;
+      }
+      continue;
+    }
+
+    if (util::istarts_with_l(line, "initial_max_data=")) {
+      if (auto n =
+              util::parse_uint(line.c_str() + str_size("initial_max_data="));
+          !n) {
+        return -1;
+      } else {
+        params->initial_max_data = *n;
+      }
     }
   }