Check if PyErr_Occurred if hiwire_get_value is passed a NULL JsRef (p…

…yodide#1114)
jmsmdy · Jan 11, 2021 · 381997a · 381997a
1 parent 953a395
commit 381997a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/core/hiwire.c b/src/core/hiwire.c
@@ -82,6 +82,12 @@ EM_JS(int, hiwire_init, (), {
   Module.hiwire.get_value = function(idval)
   {
     if (!idval) {
+      // This might have happened because the error indicator is set. Let's
+      // check.
+      if (_PyErr_Occurred()) {
+        // This will lead to a more helpful error message.
+        _pythonexc2js();
+      }
       throw new Error("Argument to hiwire.get_value is undefined");
     }
     if (!_hiwire.objects.has(idval)) {