Author: markt
Date: Tue Jun 22 11:53:26 2010
New Revision: 956856
URL: http://svn.apache.org/viewvc?rev=956856&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49424
Avoid NPE if client provides no data with a chunked POST request
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=956856&r1=956855&r2=956856&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 22 11:53:26 2010
@@ -59,10 +59,3 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=955190
+1: kfujino
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49424
- Avoid NPE if client provides no data with a chunked POST request
- http://svn.apache.org/viewvc?rev=953434&view=rev
- (by markt)
- +1: kkolinko, markt, kfujino
- -1:
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java?rev=956856&r1=956855&r2=956856&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
Tue Jun 22 11:53:26 2010
@@ -2461,7 +2461,9 @@ public class Request
}
return;
}
- parameters.processParameters(formData, 0, formData.length);
+ if (formData != null) {
+ parameters.processParameters(formData, 0, formData.length);
+ }
}
}
@@ -2507,6 +2509,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];
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=956856&r1=956855&r2=956856&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jun 22
11:53:26 2010
@@ -95,6 +95,10 @@
<fix>
Fix possible overflows when calculating session statistics. (kkolinko)
</fix>
+ <fix>
+ <bug>49424</bug>: Avoid NPE if client provides no data with a chunked
+ POST request. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
