stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8287916: Address the inconsistency between the constant array and pool size

Browse Source 
Reviewed-by: naoto, lancea, rhalade, ahgross
This commit is contained in:
Joe Wang 2022-06-18 05:17:41 +00:00 committed by Henry Jen
parent 5d1c44871a
commit f1001a06b3
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java
View File

@ -37,7 +37,7 @@ import com.sun.org.apache.bcel.internal.generic.ConstantPoolGen;
* @see Constant * @see Constant
* @see com.sun.org.apache.bcel.internal.generic.ConstantPoolGen * @see com.sun.org.apache.bcel.internal.generic.ConstantPoolGen
* @LastModified: May 2022 * @LastModified: June 2022
*/ */
public class ConstantPool implements Cloneable, Node { public class ConstantPool implements Cloneable, Node {
@ -228,8 +228,8 @@ public class ConstantPool implements Cloneable, Node {
* This is a redundant measure as the ConstantPoolGen should have already * This is a redundant measure as the ConstantPoolGen should have already
* reported an error back in the situation. * reported an error back in the situation.
*/ */
int size = constantPool.length < ConstantPoolGen.CONSTANT_POOL_SIZE - 1 ? int size = constantPool.length < ConstantPoolGen.CONSTANT_POOL_SIZE ?
constantPool.length : ConstantPoolGen.CONSTANT_POOL_SIZE - 1; constantPool.length : ConstantPoolGen.CONSTANT_POOL_SIZE;
file.writeShort(size); file.writeShort(size);
for (int i = 1; i < size; i++) { for (int i = 1; i < size; i++) {

21
src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java
View File

@ -50,10 +50,10 @@ import com.sun.org.apache.bcel.internal.classfile.ConstantUtf8;
* JVM and that Double and Long constants need two slots. * JVM and that Double and Long constants need two slots.
* *
* @see Constant * @see Constant
* @LastModified: May 2022 * @LastModified: June 2022
*/ */
public class ConstantPoolGen { public class ConstantPoolGen {
public static final int CONSTANT_POOL_SIZE = 65536; public static final int CONSTANT_POOL_SIZE = 65535;
private static final int DEFAULT_BUFFER_SIZE = 256; private static final int DEFAULT_BUFFER_SIZE = 256;
private int size; private int size;
private Constant[] constants; private Constant[] constants;
@ -81,6 +81,19 @@ public class ConstantPoolGen {
* @param cs array of given constants, new ones will be appended * @param cs array of given constants, new ones will be appended
*/ */
public ConstantPoolGen(final Constant[] cs) { public ConstantPoolGen(final Constant[] cs) {
/*
* To be logically/programmatically correct, the size of the constant pool
* shall not exceed the size limit as the code below does a copy and then
* walk through the whole array.
* This is however, not used by XSLT (or the java.xml implementation),
* and only happens when BCELifier is called (see BCELifier).
*/
if (cs.length > CONSTANT_POOL_SIZE) {
throw new RuntimeException("The number of constants " + cs.length
+ " is over the size limit of the constant pool: "
+ CONSTANT_POOL_SIZE);
}
final StringBuilder sb = new StringBuilder(DEFAULT_BUFFER_SIZE); final StringBuilder sb = new StringBuilder(DEFAULT_BUFFER_SIZE);
size = Math.min(Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64), CONSTANT_POOL_SIZE); size = Math.min(Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64), CONSTANT_POOL_SIZE);
@ -215,8 +228,8 @@ public class ConstantPoolGen {
// 3 extra spaces are needed as some entries may take 3 slots // 3 extra spaces are needed as some entries may take 3 slots
if (index + 3 >= CONSTANT_POOL_SIZE) { if (index + 3 >= CONSTANT_POOL_SIZE) {
throw new RuntimeException("The number of constants " + (index + 3) throw new RuntimeException("The number of constants " + (index + 3)
+ " is over the size of the constant pool: " + " is over the size limit of the constant pool: "
+ (CONSTANT_POOL_SIZE - 1)); + CONSTANT_POOL_SIZE);
} }
if (index + 3 >= size) { if (index + 3 >= size) {