From 8144158fdaf3db44681e5eb4ef9a77907e4746b4 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Wed, 24 Feb 2016 16:50:20 -0600 Subject: [PATCH] Fix Issue #40 autoboxing of None key or values Change-Id: Ib836eed7e2d8f68449ff8e853426401e4af2e6a6 --- src/jep/pyembed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jep/pyembed.c b/src/jep/pyembed.c index 6e2d9000..fbe9455e 100644 --- a/src/jep/pyembed.c +++ b/src/jep/pyembed.c @@ -1239,11 +1239,11 @@ jobject pyembed_box_py(JNIEnv *env, PyObject *result) pos = 0; while (PyDict_Next(result, &pos, &key, &value)) { jkey = pyembed_box_py(env, key); - if (!jkey) { + if (jkey == NULL && PyErr_Occurred()) { return NULL; } jvalue = pyembed_box_py(env, value); - if (!jvalue) { + if (jvalue == NULL && PyErr_Occurred()) { return NULL; }