more lenient path args access

esp8266 · Jul 25, 2024 · 49efe87 · 49efe87
1 parent 37debb1
commit 49efe87
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/libraries/ESP8266WebServer/README.rst b/libraries/ESP8266WebServer/README.rst
@@ -110,10 +110,10 @@ Getting information about request arguments
 
 .. code:: cpp
 
-  const String & arg();
-  const String & argName();
+  const String & arg(int);
+  const String & argName(int);
   int args();
-  bool hasArg();
+  bool hasArg(const String&);
 
 ``arg`` - get request argument value, use ``arg("plain")`` to get POST body
 
@@ -170,7 +170,7 @@ Getting information about request path arguments
 
 .. code:: cpp
 
-  const String & pathArg(unsigned int) const;
+  const String & pathArg(int) const;
   int pathArgs() const;
 
 ``pathArg`` - get request path argument by index (starting with 0)

diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h b/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h
@@ -664,8 +664,8 @@ int ESP8266WebServerTemplate<ServerType>::pathArgs() const {
 }
 
 template <typename ServerType>
-const String& ESP8266WebServerTemplate<ServerType>::pathArg(unsigned int i) const {
-  if (_currentHandler != nullptr)
+const String& ESP8266WebServerTemplate<ServerType>::pathArg(int i) const {
+  if (i >= 0 && _currentHandler != nullptr && i < _currentHandler->pathArgsSize())
     return _currentHandler->pathArg(i);
   return emptyString;
 }

diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -141,7 +141,7 @@ class ESP8266WebServerTemplate
   // Allows setting server options (i.e. SSL keys) by the instantiator
   ServerType &getServer() { return _server; }
 
-  const String& pathArg(unsigned int i) const; // get request path argument by number
+  const String& pathArg(int i) const; // get request path argument by number
   int pathArgs() const; // get path arguments count
 
   const String& arg(const String& name) const;    // get request argument value by name

diff --git a/libraries/ESP8266WebServer/src/detail/RequestHandler.h b/libraries/ESP8266WebServer/src/detail/RequestHandler.h
@@ -3,7 +3,6 @@
 
 #include <ESP8266WebServer.h>
 #include <vector>
-#include <assert.h>
 
 namespace esp8266webserver {
 
@@ -79,7 +78,6 @@ class RequestHandler {
     }
 
     const String& pathArg(unsigned int i) const {
-        assert(i < pathArgs.size());
         return pathArgs[i];
     }
 };