This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
commit 3ba8aa0c24629381140c8159bf854af018f0914d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Apr 1 09:17:31 2024 -0400
Avoid possible NullPointerException in
org.apache.bcel.generic.ClassGen.setMethods(Method[])
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/bcel/generic/ClassGen.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 27d4ca7b..919ec56d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -64,6 +64,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="update" dev="ggregory" due-to="Gary
Gregory">Avoid possible NullPointerException in
AnnotationEntryGen.getAnnotationAttributes(ConstantPoolGen,
AnnotationEntryGen[]).</action>
<action type="update" dev="ggregory" due-to="Gary
Gregory">Avoid possible NullPointerException in
AnnotationEntryGen.copyValues(ElementValuePair[], ConstantPoolGen,
boolean).</action>
<action type="update" dev="ggregory" due-to="Gary
Gregory">Avoid possible NullPointerException in
ArrayElementValueGen.ArrayElementValueGen(int, ElementValue[],
ConstantPoolGen).</action>
+ <action type="update" dev="ggregory" due-to="Gary
Gregory">Avoid possible NullPointerException in
org.apache.bcel.generic.ClassGen.setMethods(Method[]).</action>
<!-- UPDATE -->
<action type="update" dev="ggregory"
due-to="Dependabot">Bump org.apache.commons:commons-parent from 66 to 67
#283.</action>
<action type="update" dev="ggregory"
due-to="Dependabot">Bump org.jetbrains.kotlin:kotlin-stdlib from 1.9.22 to
1.9.23 #284.</action>
diff --git a/src/main/java/org/apache/bcel/generic/ClassGen.java
b/src/main/java/org/apache/bcel/generic/ClassGen.java
index b612050a..7799b14f 100644
--- a/src/main/java/org/apache/bcel/generic/ClassGen.java
+++ b/src/main/java/org/apache/bcel/generic/ClassGen.java
@@ -486,7 +486,9 @@ public class ClassGen extends AccessFlags implements
Cloneable {
public void setMethods(final Method[] methods) {
methodList.clear();
- Collections.addAll(methodList, methods);
+ if (methods != null) {
+ Collections.addAll(methodList, methods);
+ }
}
/**
