Fix missing null checks

JuditKnoll · Oct 13, 2023 · 768099b · 768099b
1 parent 4b46444
commit 768099b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/FindArgumentAssertions.java b/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/FindArgumentAssertions.java
@@ -56,12 +56,14 @@ public void visitClassContext(ClassContext classContext) {
      */
     private boolean isInitialArg() {
         XMethod m = getXMethodOperand();
-        int numPar = m.getNumParams();
-        // Get values from the stack
-        for (int i = 0; i < numPar; i++) {
-            Item item = stack.getStackItem(i);
-            if (item.isInitialParameter())
-                return true;
+        if (m != null) {
+            int numPar = m.getNumParams();
+            // Get values from the stack
+            for (int i = 0; i < numPar; i++) {
+                Item item = stack.getStackItem(i);
+                if (item.isInitialParameter())
+                    return true;
+            }
         }
         return false;
     }

diff --git a/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/FindAssertionsWithSideEffects.java b/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/FindAssertionsWithSideEffects.java
@@ -61,7 +61,7 @@ private boolean checkSeen(int seen) {
      */
     @Override
     protected void detect(int seen) {
-        if (isMethodCall(seen)) {
+        if (isMethodCall(seen) && getXClassOperand() != null && getXMethodOperand() != null) {
             String retSig = new SignatureParser(getXMethodOperand().getSignature()).getReturnTypeSignature();
             String classSig = getXClassOperand().getSourceSignature();
             if (MutableClasses.mutableSignature("L" + getClassConstantOperand() + ";") &&