Fix NPEs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk@1793911 13f79535-47bb-0310-9956-ffa450edef68
apache · May 4, 2017 · a71ed7e · a71ed7e
1 parent bf3cfe5
commit a71ed7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
@@ -2880,8 +2880,7 @@ private void parseParts(boolean explicit) {
                         String name = part.getName();
                         String value = null;
                         try {
-                            Charset paramCharset = parameters.getCharset();
-                            value = part.getString(paramCharset.name());
+                            value = part.getString(charset.name());
                         } catch (UnsupportedEncodingException uee) {
                             // Not possible
                         }

diff --git a/java/org/apache/tomcat/util/http/Parameters.java b/java/org/apache/tomcat/util/http/Parameters.java
@@ -161,7 +161,7 @@ public void recycle() {
         parameterCount = 0;
         paramHashValues.clear();
         didQueryParameters = false;
-        charset = null;
+        charset = DEFAULT_BODY_CHARSET;
         decodedQuery.recycle();
         parseFailedReason = null;
     }