Check for exception in getInt/Long/DoubleValue()

jpy-consortium · Mar 24, 2023 · 510252a · 510252a
1 parent 87b090d
commit 510252a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/main/c/jni/org_jpy_PyLib.c b/src/main/c/jni/org_jpy_PyLib.c
@@ -1196,6 +1196,10 @@ JNIEXPORT jint JNICALL Java_org_jpy_PyLib_getIntValue
 
     pyObject = (PyObject*) objId;
     value = (jint) JPy_AS_CLONG(pyObject);
+    if (value == -1 && PyErr_Occurred()) {
+        JPy_DIAG_PRINT(JPy_DIAG_F_ALL, "Java_org_jpy_PyLib_getIntValue: error: failed to convert Python object to Java int\n");
+        PyLib_HandlePythonException(jenv);
+    }
 
     JPy_END_GIL_STATE
 
@@ -1217,7 +1221,10 @@ JNIEXPORT jlong JNICALL Java_org_jpy_PyLib_getLongValue
 
     pyObject = (PyObject*) objId;
     value = JPy_AS_CLONG(pyObject);
-
+    if (value == -1 && PyErr_Occurred()) {
+        JPy_DIAG_PRINT(JPy_DIAG_F_ALL, "Java_org_jpy_PyLib_getLongValue: error: failed to convert Python object to Java long\n");
+        PyLib_HandlePythonException(jenv);
+    }
     JPy_END_GIL_STATE
 
     return value;
@@ -1262,6 +1269,10 @@ JNIEXPORT jdouble JNICALL Java_org_jpy_PyLib_getDoubleValue
 
     pyObject = (PyObject*) objId;
     value = (jdouble) PyFloat_AsDouble(pyObject);
+    if (value == -1.0 && PyErr_Occurred()) {
+        JPy_DIAG_PRINT(JPy_DIAG_F_ALL, "Java_org_jpy_PyLib_getDoubleValue: error: failed to convert Python object to Java double\n");
+        PyLib_HandlePythonException(jenv);
+    }
 
     JPy_END_GIL_STATE
 

diff --git a/src/test/java/org/jpy/PyObjectTest.java b/src/test/java/org/jpy/PyObjectTest.java
@@ -644,4 +644,11 @@ public void errorIfUsageAfterClose() {
         obj.close();
         obj.getPointer();
     }
+
+    @Test(expected = RuntimeException.class)
+    public void errorGetInValue_IntExpr() throws Exception {
+        PyObject pyObject = PyObject.executeCode("None", PyInputMode.EXPRESSION);
+        pyObject.getIntValue();
+    }
+
 }