Author: markt
Date: Mon Jul 28 20:53:54 2014
New Revision: 1614171
URL: http://svn.apache.org/r1614171
Log:
When scanning class files (e.g. for annotations) and reading the number of
parameters in a <code>MethodParameters</code> structure only read a single byte
(rather than two bytes) as per the JVM specification. Patch provided by labes.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1614169
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1614169
Merged
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:r1609332-1614166
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1614171&r1=1614170&r2=1614171&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Mon Jul 28 20:53:54 2014
@@ -791,7 +791,7 @@ public abstract class Utility {
}
static void swallowMethodParameters(DataInput file) throws IOException {
- int parameters_count = file.readUnsignedShort();
+ int parameters_count = file.readUnsignedByte();
for (int i = 0; i < parameters_count; i++) {
file.readUnsignedShort(); // Unused name_index
file.readUnsignedShort(); // Unused access_flags
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1614171&r1=1614170&r2=1614171&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 28 20:53:54 2014
@@ -56,6 +56,16 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.56 (violetagg)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ When scanning class files (e.g. for annotations) and reading the number
+ of parameters in a <code>MethodParameters</code> structure only read a
+ single byte (rather than two bytes) as per the JVM specification. Patch
+ provided by labes. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
