convert result early, to make sure the pointer conversion will work with ERROR_MARKER

timfel · timfel · commit 6f50f5b47a9c · 2018-06-29T13:55:36.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/longobject.c b/graalpython/com.oracle.graal.python.cext/src/longobject.c
@@ -106,11 +106,11 @@ void * PyLong_AsVoidPtr(PyObject *obj){
 }
 
 PyObject * PyLong_FromLong(long n)  {
-    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_FromLongLong", n, 1);
+    void *result = to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_FromLongLong", n, 1));
     if (result == ERROR_MARKER) {
     	return NULL;
     }
-    return to_sulong(result);
+    return result;
 }
 
 PyObject * PyLong_FromLongLong(long long n)  {

Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,11 @@ void * PyLong_AsVoidPtr(PyObject *obj){`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`PyObject * PyLong_FromLong(long n) {`
`109`		`- void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_FromLongLong", n, 1);`
	`109`	`+ void *result = to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_FromLongLong", n, 1));`
`110`	`110`	`if (result == ERROR_MARKER) {`
`111`	`111`	`return NULL;`
`112`	`112`	`}`
`113`		`- return to_sulong(result);`
	`113`	`+ return result;`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`PyObject * PyLong_FromLongLong(long long n) {`