Author: markt
Date: Fri Oct 24 21:15:53 2014
New Revision: 1634139
URL: http://svn.apache.org/r1634139
Log:
Throw a NPE if a null string is passed to the write(String,int,int) method of
the PrintWriter obtained from the ServletResponse.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1634139&r1=1634138&r2=1634139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Fri
Oct 24 21:15:53 2014
@@ -63,6 +63,8 @@ coyoteResponse.setBufferSize.ise=Cannot
inputBuffer.streamClosed=Stream closed
+outputBuffer.writeNull=The String argument to write(String,int,int) may not be
null
+
request.asyncNotSupported=A filter or servlet of the current chain does not
support asynchronous operations.
requestFacade.nullRequest=The request object has been recycled and is no
longer associated with this facade
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1634139&r1=1634138&r2=1634139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Fri Oct
24 21:15:53 2014
@@ -32,6 +32,7 @@ import org.apache.coyote.Response;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.C2BConverter;
import org.apache.tomcat.util.buf.CharChunk;
+import org.apache.tomcat.util.res.StringManager;
/**
* The buffer used by Tomcat response. This is a derivative of the Tomcat 3.3
@@ -44,6 +45,9 @@ import org.apache.tomcat.util.buf.CharCh
public class OutputBuffer extends Writer
implements ByteChunk.ByteOutputChannel, CharChunk.CharOutputChannel {
+ private static final StringManager sm =
+ StringManager.getManager(Constants.Package);
+
// -------------------------------------------------------------- Constants
public static final String DEFAULT_ENCODING =
@@ -524,7 +528,7 @@ public class OutputBuffer extends Writer
}
if (s == null) {
- s = "null";
+ throw new
NullPointerException(sm.getString("outputBuffer.writeNull"));
}
cb.append(s, off, len);
charsWritten += len;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1634139&r1=1634138&r2=1634139&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct 24 21:15:53 2014
@@ -169,6 +169,12 @@
Update storeconfig with newly introduced elements: SessionIdGenerator,
CookieProcessor, JarScanner and JarScanFilter. (remm)
</fix>
+ <fix>
+ Throw a <code>NullPointerException</code> if a null string is passed to
+ the <code>write(String,int,int)</code> method of the
+ <code>PrintWriter</code> obtained from the
<code>ServletResponse</code>.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
