Skip to content

Commit

Permalink
Prevent NPE in MultiAttributeVisitor
Browse files Browse the repository at this point in the history 
Replace `attributeVisitors.length` with `attributeVisitorCount` to avoid NPEs.
  • Loading branch information
@jelle-dc @rubenpieters
jelle-dc authored and rubenpieters committed Apr 11, 2024
1 parent f1e922e commit e37898f
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions base/src/main/java/proguard/classfile/attribute/visitor/MultiAttributeVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,21 +122,21 @@ public void visitPermittedSubclassesAttribute(
}

public void visitModuleAttribute(Clazz clazz, ModuleAttribute moduleAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitModuleAttribute(clazz, moduleAttribute);
}
}

public void visitModuleMainClassAttribute(
Clazz clazz, ModuleMainClassAttribute moduleMainClassAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitModuleMainClassAttribute(clazz, moduleMainClassAttribute);
}
}

public void visitModulePackagesAttribute(
Clazz clazz, ModulePackagesAttribute modulePackagesAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitModulePackagesAttribute(clazz, modulePackagesAttribute);
}
}
Expand Down Expand Up @@ -218,7 +218,7 @@ public void visitConstantValueAttribute(

public void visitMethodParametersAttribute(
Clazz clazz, Method method, MethodParametersAttribute methodParametersAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitMethodParametersAttribute(
clazz, method, methodParametersAttribute);
}
Expand Down Expand Up @@ -390,7 +390,7 @@ public void visitRuntimeInvisibleParameterAnnotationsAttribute(

public void visitRuntimeVisibleTypeAnnotationsAttribute(
Clazz clazz, RuntimeVisibleTypeAnnotationsAttribute runtimeVisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeVisibleTypeAnnotationsAttribute(
clazz, runtimeVisibleTypeAnnotationsAttribute);
}
Expand All @@ -400,7 +400,7 @@ public void visitRuntimeVisibleTypeAnnotationsAttribute(
Clazz clazz,
RecordComponentInfo recordComponentInfo,
RuntimeVisibleTypeAnnotationsAttribute runtimeVisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeVisibleTypeAnnotationsAttribute(
clazz, recordComponentInfo, runtimeVisibleTypeAnnotationsAttribute);
}
Expand All @@ -410,7 +410,7 @@ public void visitRuntimeVisibleTypeAnnotationsAttribute(
Clazz clazz,
Field field,
RuntimeVisibleTypeAnnotationsAttribute runtimeVisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeVisibleTypeAnnotationsAttribute(
clazz, field, runtimeVisibleTypeAnnotationsAttribute);
}
Expand All @@ -420,7 +420,7 @@ public void visitRuntimeVisibleTypeAnnotationsAttribute(
Clazz clazz,
Method method,
RuntimeVisibleTypeAnnotationsAttribute runtimeVisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeVisibleTypeAnnotationsAttribute(
clazz, method, runtimeVisibleTypeAnnotationsAttribute);
}
Expand All @@ -431,7 +431,7 @@ public void visitRuntimeVisibleTypeAnnotationsAttribute(
Method method,
CodeAttribute codeAttribute,
RuntimeVisibleTypeAnnotationsAttribute runtimeVisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeVisibleTypeAnnotationsAttribute(
clazz, method, codeAttribute, runtimeVisibleTypeAnnotationsAttribute);
}
Expand All @@ -440,7 +440,7 @@ public void visitRuntimeVisibleTypeAnnotationsAttribute(
public void visitRuntimeInvisibleTypeAnnotationsAttribute(
Clazz clazz,
RuntimeInvisibleTypeAnnotationsAttribute runtimeInvisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeInvisibleTypeAnnotationsAttribute(
clazz, runtimeInvisibleTypeAnnotationsAttribute);
}
Expand All @@ -450,7 +450,7 @@ public void visitRuntimeInvisibleTypeAnnotationsAttribute(
Clazz clazz,
RecordComponentInfo recordComponentInfo,
RuntimeInvisibleTypeAnnotationsAttribute runtimeInvisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeInvisibleTypeAnnotationsAttribute(
clazz, recordComponentInfo, runtimeInvisibleTypeAnnotationsAttribute);
}
Expand All @@ -460,7 +460,7 @@ public void visitRuntimeInvisibleTypeAnnotationsAttribute(
Clazz clazz,
Field field,
RuntimeInvisibleTypeAnnotationsAttribute runtimeInvisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeInvisibleTypeAnnotationsAttribute(
clazz, field, runtimeInvisibleTypeAnnotationsAttribute);
}
Expand All @@ -470,7 +470,7 @@ public void visitRuntimeInvisibleTypeAnnotationsAttribute(
Clazz clazz,
Method method,
RuntimeInvisibleTypeAnnotationsAttribute runtimeInvisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeInvisibleTypeAnnotationsAttribute(
clazz, method, runtimeInvisibleTypeAnnotationsAttribute);
}
Expand All @@ -481,7 +481,7 @@ public void visitRuntimeInvisibleTypeAnnotationsAttribute(
Method method,
CodeAttribute codeAttribute,
RuntimeInvisibleTypeAnnotationsAttribute runtimeInvisibleTypeAnnotationsAttribute) {
for (int index = 0; index < attributeVisitors.length; index++) {
for (int index = 0; index < attributeVisitorCount; index++) {
attributeVisitors[index].visitRuntimeInvisibleTypeAnnotationsAttribute(
clazz, method, codeAttribute, runtimeInvisibleTypeAnnotationsAttribute);
}
Expand Down

0 comments on commit e37898f

Please sign in to comment.