Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49424

Avoid NPE if no input data is provided in a chunked POST request

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@953434 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index eeb9d79..4ed0f60 100644 (file)
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2818,7 +2818,9 @@ public class Request
                 }
                 return;
             }
-            parameters.processParameters(formData, 0, formData.length);
+            if (formData != null) {
+                parameters.processParameters(formData, 0, formData.length);
+            }
         }
 
     }
@@ -2864,6 +2866,9 @@ public class Request
                 body.append(buffer, 0, len);
             }
         }
+        if (body.getLength() == 0) {
+            return null;
+        }
         if (body.getLength() < body.getBuffer().length) {
             int length = body.getLength();
             byte[] result = new byte[length];