Merge branch 'master' into renovate/org.mockito-mockito-core-3.x

Fraunhofer-AISEC · Nov 28, 2020 · e8fac90 · e8fac90
2 parents 9b08687 + 0192552
commit e8fac90
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/de/fraunhofer/aisec/cpg/frontends/cpp/ExpressionHandler.java b/src/main/java/de/fraunhofer/aisec/cpg/frontends/cpp/ExpressionHandler.java
@@ -292,12 +292,15 @@ private Expression handleSimpleTypeConstructorExpression(
   private Expression handleFieldReference(CPPASTFieldReference ctx) {
     Expression base = this.handle(ctx.getFieldOwner());
     // Replace Literal this with a reference pointing to this
-    if (base instanceof Literal && ((Literal) base).getValue().equals("this")) {
+    if (base instanceof Literal && ((Literal<?>) base).getValue().equals("this")) {
       PhysicalLocation location = base.getLocation();
+
+      var record = lang.getScopeManager().getCurrentRecord();
+
       base =
           NodeBuilder.newDeclaredReferenceExpression(
               "this",
-              lang.getScopeManager().getCurrentRecord().getThis().getType(),
+              record != null ? record.getThis().getType() : UnknownType.getUnknownType(),
               base.getCode());
       base.setLocation(location);
     }