[tomcat] branch master updated: Fix BZ 64852. Avoid exception under a security manager

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new a2ca285  Fix BZ 64852. Avoid exception under a security manager
a2ca285 is described below

commit a2ca285c3328a70817cfa79524d61f7232483bd1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 9 11:50:39 2020 +0100

    Fix BZ 64852. Avoid exception under a security manager
    
    Patch provided by Johnathan Gilday
    https://bz.apache.org/bugzilla/show_bug.cgi?id=64582
---
 java/org/apache/catalina/security/SecurityClassLoad.java | 1 +
 webapps/docs/changelog.xml                               | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java 
b/java/org/apache/catalina/security/SecurityClassLoad.java
index 45b2b88..1821695 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -149,6 +149,7 @@ public final class SecurityClassLoad {
         loader.loadClass(basePackage + "CoyoteInputStream$PrivilegedRead");
         loader.loadClass(basePackage + 
"CoyoteInputStream$PrivilegedReadArray");
         loader.loadClass(basePackage + 
"CoyoteInputStream$PrivilegedReadBuffer");
+        loader.loadClass(basePackage + "CoyoteOutputStream");
         loader.loadClass(basePackage + 
"InputBuffer$PrivilegedCreateConverter");
         loader.loadClass(basePackage + "Response$PrivilegedDoIsEncodable");
         loader.loadClass(basePackage + 
"Response$PrivilegedGenerateCookieString");
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 11acb74..5445e66 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 10.0.0-M8 (markt)" rtext="in development">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <bug>64582</bug>: Pre-load the <code>CoyoteOutputStream</code> class to
+        prevent a potential exception when running under a security manager.
+        Patch provided by Johnathan Gilday. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Coyote">
     <changelog>
       <fix>


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