Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 86611 invoked from network); 10 Jun 2010 19:59:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Jun 2010 19:59:32 -0000 Received: (qmail 46302 invoked by uid 500); 10 Jun 2010 19:59:31 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 46239 invoked by uid 500); 10 Jun 2010 19:59:31 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 46230 invoked by uid 99); 10 Jun 2010 19:59:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jun 2010 19:59:31 +0000 X-ASF-Spam-Status: No, hits=-1477.7 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jun 2010 19:59:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 88FDB238890B; Thu, 10 Jun 2010 19:58:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r953434 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java Date: Thu, 10 Jun 2010 19:58:49 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100610195849.88FDB238890B@eris.apache.org> Author: markt Date: Thu Jun 10 19:58:49 2010 New Revision: 953434 URL: http://svn.apache.org/viewvc?rev=953434&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49424 Avoid NPE if no input data is provided in a chunked POST request Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=953434&r1=953433&r2=953434&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Jun 10 19:58:49 2010 @@ -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]; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org