diff options
Diffstat (limited to 'Zend/zend_exceptions.h')
| -rw-r--r-- | Zend/zend_exceptions.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h index cd64a594e5..e8817c652a 100644 --- a/Zend/zend_exceptions.h +++ b/Zend/zend_exceptions.h @@ -68,9 +68,15 @@ extern ZEND_API void (*zend_throw_exception_hook)(zval *ex); /* show an exception using zend_error(severity,...), severity should be E_ERROR */ ZEND_API ZEND_COLD void zend_exception_error(zend_object *exception, int severity); -/* do not export, in php it's available thru spprintf directly */ -size_t zend_spprintf(char **message, size_t max_len, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 3, 4); -zend_string *zend_strpprintf(size_t max_len, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); +#include "zend_globals.h" + +static zend_always_inline void zend_rethrow_exception(zend_execute_data *execute_data) +{ + if (EX(opline)->opcode != ZEND_HANDLE_EXCEPTION) { + EG(opline_before_exception) = EX(opline); + EX(opline) = EG(exception_op); + } +} END_EXTERN_C() @@ -82,4 +88,6 @@ END_EXTERN_C() * c-basic-offset: 4 * indent-tabs-mode: t * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */ |