Properly check arg types of ctx_CallTupleDict

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java

@@ -2002,10 +2002,10 @@ Object execute(Object[] arguments,
                         @Cached HPyTransformExceptionToNativeNode transformExceptionToNativeNode) throws ArityException, UnsupportedTypeException {
             checkArity(arguments, 4);
             GraalHPyContext nativeContext = asContextNode.execute(arguments[0]);
-            Object callable = asPythonObjectNode.execute(nativeContext, arguments[1]);
             try {
                 Object[] args = castArgsNode.execute(ensureHandleNode.execute(nativeContext, arguments[2]));
                 PKeyword[] keywords = castKwargsNode.execute(ensureHandleNode.execute(nativeContext, arguments[3]));
+                Object callable = asPythonObjectNode.execute(nativeContext, arguments[1]);
                 return asHandleNode.execute(nativeContext, callNode.execute(callable, args, keywords));
             } catch (PException e) {
                 // transformExceptionToNativeNode acts as a branch profile

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java

@@ -2136,8 +2136,13 @@ static Object[] doNull(GraalHPyHandle argsHandle) {
 
         @Specialization(guards = "!argsHandle.isNull()")
         static Object[] doNotNull(GraalHPyHandle argsHandle,
-                        @Cached ExecutePositionalStarargsInteropNode expandArgsNode) {
-            return expandArgsNode.executeWithGlobalState(argsHandle.getDelegate());
+                        @Cached ExecutePositionalStarargsInteropNode expandArgsNode,
+                        @Cached PRaiseNode raiseNode) {
+            Object args = argsHandle.getDelegate();
+            if (PGuards.isPTuple(args)) {
+                return expandArgsNode.executeWithGlobalState(args);
+            }
+            throw raiseNode.raise(TypeError, "HPy_CallTupleDict requires args to be a tuple or null handle");
         }
     }
 
@@ -2158,8 +2163,12 @@ static PKeyword[] doNoKeywords(GraalHPyHandle kwargsHandle,
         static PKeyword[] doKeywords(@SuppressWarnings("unused") GraalHPyHandle kwargsHandle,
                         @Bind("kwargsHandle.getDelegate()") Object delegate,
                         @Shared("lenNode") @Cached @SuppressWarnings("unused") HashingCollectionNodes.LenNode lenNode,
-                        @Cached ExpandKeywordStarargsNode expandKwargsNode) {
-            return expandKwargsNode.execute(delegate);
+                        @Cached ExpandKeywordStarargsNode expandKwargsNode,
+                        @Cached PRaiseNode raiseNode) {
+            if (PGuards.isDict(delegate)) {
+                return expandKwargsNode.execute(delegate);
+            }
+            throw raiseNode.raise(TypeError, "HPy_CallTupleDict requires kw to be a dict or null handle");
         }
 
         static boolean isEmptyDict(HashingCollectionNodes.LenNode lenNode, Object delegate) {