Source Format Enforcement (#1234)

[thirdparty/squid.git] / src / DelaySpec.cc

diff --git a/src/DelaySpec.cc b/src/DelaySpec.cc
index 631f111e63c042abfd4c789e7c0830f7bd8b9eeb..8fed4dcdf0b05dc347a9b1c2611121c49361e326 100644 (file)
--- a/src/DelaySpec.cc
+++ b/src/DelaySpec.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -41,19 +41,34 @@ DelaySpec::dump (StoreEntry *entry) const
 void
 DelaySpec::parse()
 {
-    int r;
-    char *token;
-    token = strtok(NULL, "/");
-
-    if (token == NULL)
+    // get the token.
+    char *token = ConfigParser::NextToken();
+    if (!token) {
         self_destruct();
+        return;
+    }
 
-    if (sscanf(token, "%d", &r) != 1)
-        self_destruct();
+    // no-limit value
+    if (strcmp(token, "none") == 0 || token[0] == '-') {
+        restore_bps = -1;
+        max_bytes = -1;
+        return;
+    }
 
-    restore_bps = r;
+    // parse the first digits into restore_bps
+    const char *p = nullptr;
+    if (!StringToInt(token, restore_bps, &p, 10) || *p != '/') {
+        debugs(77, DBG_CRITICAL, "ERROR: invalid delay rate '" << token << "'. Expecting restore/max or 'none'.");
+        self_destruct();
+    }
+    p++; // increment past the '/'
 
-    max_bytes = GetInteger64();
+    // parse the rest into max_bytes
+    if (!StringToInt64(p, max_bytes, nullptr, 10)) {
+        debugs(77, DBG_CRITICAL, "ERROR: restore rate in '" << token << "' is not a number.");
+        self_destruct();
+    }
 }
 
 #endif
+