[pysrc2cpg] Fixed Crashes on Import Code (#2245)

joernio · Feb 5, 2023 · 7122dfd · 7122dfd
1 parent 06dbca0
commit 7122dfd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/joern-cli/frontends/pysrc2cpg/src/main/scala/io/joern/pysrc2cpg/ContextStack.scala b/joern-cli/frontends/pysrc2cpg/src/main/scala/io/joern/pysrc2cpg/ContextStack.scala
@@ -348,9 +348,11 @@ class ContextStack {
 
   def isClassContext: Boolean = {
     val stackTail = stack.tail
-    stackTail.nonEmpty &&
-    (stackTail.head.isInstanceOf[ClassContext] ||
-      stackTail.head.asInstanceOf[MethodContext].name.endsWith("<body>"))
+    stackTail.nonEmpty && (stackTail.headOption match {
+      case Some(_: ClassContext)  => true
+      case Some(x: MethodContext) => x.name.endsWith("<body>")
+      case _                      => false
+    })
   }
 
 }
diff --git a/joern-cli/frontends/pysrc2cpg/src/main/scala/io/joern/pysrc2cpg/PythonTypeRecovery.scala b/joern-cli/frontends/pysrc2cpg/src/main/scala/io/joern/pysrc2cpg/PythonTypeRecovery.scala
@@ -260,12 +260,12 @@ class RecoverForPythonFile(cpg: Cpg, cu: File, builder: DiffGraphBuilder, global
     if (!callCode.endsWith(")")) {
       // Case 1: The identifier is at the assignment to a function pointer. Lack of parenthesis should indicate this.
       setIdentifier(i, importedTypes)
-    } else if (callName.charAt(0).isUpper && callCode.endsWith(")")) {
+    } else if (!callName.isBlank && callName.charAt(0).isUpper && callCode.endsWith(")")) {
       // Case 2: The identifier is receiving a constructor invocation, thus is now an instance of the type
       setIdentifier(i, importedTypes.map(_.stripSuffix(s".${Defines.ConstructorMethodName}")))
     } else {
       // TODO: This identifier should contain the type of the return value of 'c'.
-      //  e.g. x = foo(a, b) but not x = y.foo(a, b) as foo in the latter case is interpetted as a field access
+      //  e.g. x = foo(a, b) but not x = y.foo(a, b) as foo in the latter case is interpreted as a field access
     }
   }