Author: jochen
Date: Fri Apr 3 05:59:39 2009
New Revision: 761531
URL: http://svn.apache.org/viewvc?rev=761531&view=rev
Log:
PR: XMLRPC-165
Submitted-By: Alan Burlison <[email protected]>
Fixed a possible NPE in case of a malformed HTTP request in the WebServer.
Modified:
webservices/xmlrpc/trunk/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
webservices/xmlrpc/trunk/src/changes/changes.xml
Modified:
webservices/xmlrpc/trunk/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
URL:
http://svn.apache.org/viewvc/webservices/xmlrpc/trunk/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java?rev=761531&r1=761530&r2=761531&view=diff
==============================================================================
---
webservices/xmlrpc/trunk/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
(original)
+++
webservices/xmlrpc/trunk/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
Fri Apr 3 05:59:39 2009
@@ -105,8 +105,8 @@
byte[] buffer = new byte[2048];
String line = readLine(buffer);
- StringTokenizer tokens = new StringTokenizer(line);
- if (!tokens.hasMoreTokens()) {
+ StringTokenizer tokens = line!=null? new StringTokenizer(line): null;
+ if (tokens==null || !tokens.hasMoreTokens()) {
throw new ServletWebServer.Exception(400, "Bad Request",
"Unable to parse requests first line (should"
+ " be 'METHOD uri HTTP/version', was empty.");
Modified: webservices/xmlrpc/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/webservices/xmlrpc/trunk/src/changes/changes.xml?rev=761531&r1=761530&r2=761531&view=diff
==============================================================================
--- webservices/xmlrpc/trunk/src/changes/changes.xml (original)
+++ webservices/xmlrpc/trunk/src/changes/changes.xml Fri Apr 3 05:59:39 2009
@@ -41,6 +41,9 @@
issue="XMLRPC-159">
Improved the handling of HTTP status codes that indicate an error.
</action>
+ <action dev="jochen" type="fix" due-to="Alan Burlison"
due-to-email="[email protected]">
+ Fixed a possible NPE in case of a malformed HTTP request in the
WebServer.
+ </action>
</release>
<release version="3.1.1" date="2008-Aug-10">
