From 1b94b29d4fac928343f335d5815ff2581ca5e8f3 Mon Sep 17 00:00:00 2001
From: NDMDevel <NDMDevel@users.noreply.github.com>
Date: Thu, 3 Mar 2022 20:01:16 -0300
Subject: [PATCH 1/2] Small bug fix at WebRequest.cpp

In WebRequest.cpp at line 150:
while (i<len && __is_param_char(((char*)buf)[i++]));
the macro __is_param_char will expand producing multiple i++ invocations making the algorithm to (sometimes) fail.
---
 src/WebRequest.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/WebRequest.cpp b/src/WebRequest.cpp
index bbce5ca4c..d639004d6 100644
--- a/src/WebRequest.cpp
+++ b/src/WebRequest.cpp
@@ -147,7 +147,12 @@ void AsyncWebServerRequest::_onData(void *buf, size_t len){
           _isPlainPost = true;
         } else if(_contentType == "text/plain" && __is_param_char(((char*)buf)[0])){
           size_t i = 0;
-          while (i<len && __is_param_char(((char*)buf)[i++]));
+          while (i<len)
+          {
+            auto data = ((char*)buf)[i++];
+            if( !__is_param_char(data) )
+              break;
+          }
           if(i < len && ((char*)buf)[i-1] == '='){
             _isPlainPost = true;
           }

From b603052a25df29c80ac91e02d5f77f40f26788ee Mon Sep 17 00:00:00 2001
From: NDMDevel <NDMDevel@users.noreply.github.com>
Date: Wed, 9 Mar 2022 16:26:47 -0300
Subject: [PATCH 2/2] Replace macro "__is_param_char" with an equivalent
 function

---
 src/WebRequest.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/WebRequest.cpp b/src/WebRequest.cpp
index d639004d6..207879bac 100644
--- a/src/WebRequest.cpp
+++ b/src/WebRequest.cpp
@@ -28,7 +28,14 @@
 
 static const String SharedEmptyString = String();
 
-#define __is_param_char(c) ((c) && ((c) != '{') && ((c) != '[') && ((c) != '&') && ((c) != '='))
+bool is_param_char(char c) {
+  return 
+	(c != 0) && 
+	(c != '{') && 
+	(c != '[') && 
+	(c != '&') && 
+	(c != '=');
+}
 
 enum { PARSE_REQ_START, PARSE_REQ_HEADERS, PARSE_REQ_BODY, PARSE_REQ_END, PARSE_REQ_FAIL };
 
@@ -145,14 +152,9 @@ void AsyncWebServerRequest::_onData(void *buf, size_t len){
       if(_parsedLength == 0){
         if(_contentType.startsWith("application/x-www-form-urlencoded")){
           _isPlainPost = true;
-        } else if(_contentType == "text/plain" && __is_param_char(((char*)buf)[0])){
+        } else if(_contentType == "text/plain" && is_param_char(((char*)buf)[0])){
           size_t i = 0;
-          while (i<len)
-          {
-            auto data = ((char*)buf)[i++];
-            if( !__is_param_char(data) )
-              break;
-          }
+	  while (i<len && is_param_char(((char*)buf)[i++]));
           if(i < len && ((char*)buf)[i-1] == '='){
             _isPlainPost = true;
           }