tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1224657 - in /tomcat/trunk/java/org/apache/tomcat/util/http: LocalStrings.properties Parameters.java
Date Sun, 25 Dec 2011 23:25:52 GMT
Author: kkolinko
Date: Sun Dec 25 23:25:51 2011
New Revision: 1224657

URL: http://svn.apache.org/viewvc?rev=1224657&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52384
Do not fail in Parameter parsing when debug logging is enabled.
Also do no flag extra '&' as errors.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1224657&r1=1224656&r2=1224657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Sun Dec 25 23:25:51
2011
@@ -17,6 +17,7 @@ parameters.bytes=Start processing with i
 parameters.copyFail=Failed to create copy of original parameter values for debug logging
purposes
 parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with value [{1}] has
been ignored.
 parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with value [{1}] has
been ignored. Note that the name and value quoted here may be corrupted due to the failed
decoding. Use debug level logging to see the original, non-corrupted values.
+parameters.emptyChunk=Empty parameter chunk ignored
 parameters.invalidChunk=Invalid chunk starting at byte [{0}] and ending at byte [{1}] with
a value of [{2}] ignored
 parameters.maxCountFail=More than the maximum number of request parameters (GET plus POST)
for a single request ([{0}]) were detected. Any parameters beyond this limit have been ignored.
To change this limit, set the maxParameterCount attribute on the Connector.
 parameters.multipleDecodingFail=Character decoding failed. A total of [{0}] failures were
detected but only the first was logged. Enable debug level logging for this logger to log
all failures.

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1224657&r1=1224656&r2=1224657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Sun Dec 25 23:25:51 2011
@@ -297,6 +297,15 @@ public final class Parameters {
             }
 
             if (nameEnd <= nameStart ) {
+                if (valueStart == -1) {
+                    // &&
+                    if (log.isDebugEnabled()) {
+                        log.debug(sm.getString("parameters.emptyChunk"));
+                    }
+                    // Do not flag as error
+                    continue;
+                }
+                // &=foo&
                 if (log.isInfoEnabled()) {
                     if (valueEnd >= nameStart && log.isDebugEnabled()) {
                         String extract = new String(bytes, nameStart,
@@ -318,7 +327,11 @@ public final class Parameters {
             }
 
             tmpName.setBytes(bytes, nameStart, nameEnd - nameStart);
-            tmpValue.setBytes(bytes, valueStart, valueEnd - valueStart);
+            if (valueStart >= 0) {
+                tmpValue.setBytes(bytes, valueStart, valueEnd - valueStart);
+            } else {
+                tmpValue.setBytes(bytes, 0, 0);
+            }
 
             // Take copies as if anything goes wrong originals will be
             // corrupted. This means original values can be logged.
@@ -326,7 +339,11 @@ public final class Parameters {
             if (log.isDebugEnabled()) {
                 try {
                     origName.append(bytes, nameStart, nameEnd - nameStart);
-                    origValue.append(bytes, valueStart, valueEnd - valueStart);
+                    if (valueStart >= 0) {
+                        origValue.append(bytes, valueStart, valueEnd - valueStart);
+                    } else {
+                        origValue.append(bytes, 0, 0);
+                    }
                 } catch (IOException ioe) {
                     // Should never happen...
                     log.error(sm.getString("parameters.copyFail"), ioe);
@@ -343,11 +360,15 @@ public final class Parameters {
                 tmpName.setCharset(charset);
                 name = tmpName.toString();
 
-                if (decodeValue) {
-                    urlDecode(tmpValue);
+                if (valueStart >= 0) {
+                    if (decodeValue) {
+                        urlDecode(tmpValue);
+                    }
+                    tmpValue.setCharset(charset);
+                    value = tmpValue.toString();
+                } else {
+                    value = "";
                 }
-                tmpValue.setCharset(charset);
-                value = tmpValue.toString();
 
                 try {
                     addParameter(name, value);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message