Avoid NPE in sys._getframe

msimacek · msimacek · commit e824f24edf4d · 2020-07-30T11:47:53.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadCallerFrameNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadCallerFrameNode.java
@@ -131,7 +131,7 @@ private PFrame.Reference walkLevels(VirtualFrame frame, PFrame.Reference startFr
                     return PArguments.getCurrentFrameInfo(callerFrame);
                 }
                 return PFrame.Reference.EMPTY;
-            } else if (!(skipInternal && PRootNode.isPythonInternal(callerInfo.getCallNode().getRootNode()))) {
+            } else if (!(skipInternal && (callerInfo.getCallNode() == null || PRootNode.isPythonInternal(callerInfo.getCallNode().getRootNode())))) {
                 i++;
             }
             currentFrame = callerInfo;

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private PFrame.Reference walkLevels(VirtualFrame frame, PFrame.Reference startFr`
`131`	`131`	`return PArguments.getCurrentFrameInfo(callerFrame);`
`132`	`132`	`}`
`133`	`133`	`return PFrame.Reference.EMPTY;`
`134`		`- } else if (!(skipInternal && PRootNode.isPythonInternal(callerInfo.getCallNode().getRootNode()))) {`
	`134`	`+ } else if (!(skipInternal && (callerInfo.getCallNode() == null \|\| PRootNode.isPythonInternal(callerInfo.getCallNode().getRootNode())))) {`
`135`	`135`	`i++;`
`136`	`136`	`}`
`137`	`137`	`currentFrame = callerInfo;`