Fix exception catching and properly handle casting functions returning something other than a Php::Value

1 files changed, 1 insertions, 2 deletions

diff --git a/zend/opcodes.h b/zend/opcodes.h
index 1901f1f..0a79b97 100644
--- a/zend/opcodes.h
+++ b/zend/opcodes.h
@@ -93,8 +93,7 @@ public:
 
         // was an exception thrown inside the eval()'ed code? In that case we
         // throw a C++ new exception to give the C++ code the chance to catch it
-        // todo: OrigException with constructor for zend_object
-        // if (oldException != EG(exception) && EG(exception)) throw OrigException(EG(exception) TSRMLS_CC);
+        if (oldException != EG(exception) && EG(exception)) throw OrigException(EG(exception) TSRMLS_CC);
 
         // we're ready if there is no return value
         if (ZVAL_IS_NULL(&retval)) return nullptr;