Skip to content

Commit

Permalink
Fix #495
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeyklay authored and dreamsxin committed Apr 21, 2020
1 parent d8c91fd commit 40c0c21
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion ext/aop.c
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,10 @@ void phalcon_aop_do_func_execute(HashPosition pos, zend_array *pointcut_table, z
execute_pointcut(current_pc, aop_object, &pointcut_ret);
if (Z_TYPE(pointcut_ret) > IS_NULL) {
if (ex->return_value != NULL) {
zval_ptr_dtor(ex->return_value);
if (Z_TYPE_P(ex->return_value) > IS_NULL && Z_TYPE_P(ex->return_value) < 21) {
zval_ptr_dtor(ex->return_value);
}

ZVAL_COPY_VALUE(ex->return_value, &pointcut_ret);
} else {
zval_ptr_dtor(&pointcut_ret);
Expand Down

0 comments on commit 40c0c21

Please sign in to comment.