@@ -115,15 +115,18 @@ void zend_exception_set_previous(zend_object *exception, zend_object *add_previo
115
115
ex = & zv ;
116
116
do {
117
117
ancestor = zend_read_property_ex (i_get_exception_base (add_previous ), add_previous , ZSTR_KNOWN (ZEND_STR_PREVIOUS ), 1 , & rv );
118
+ ZVAL_DEREF (ancestor );
118
119
while (Z_TYPE_P (ancestor ) == IS_OBJECT ) {
119
120
if (Z_OBJ_P (ancestor ) == Z_OBJ_P (ex )) {
120
121
OBJ_RELEASE (add_previous );
121
122
return ;
122
123
}
123
124
ancestor = zend_read_property_ex (i_get_exception_base (Z_OBJ_P (ancestor )), Z_OBJ_P (ancestor ), ZSTR_KNOWN (ZEND_STR_PREVIOUS ), 1 , & rv );
125
+ ZVAL_DEREF (ancestor );
124
126
}
125
127
base_ce = i_get_exception_base (Z_OBJ_P (ex ));
126
128
previous = zend_read_property_ex (base_ce , Z_OBJ_P (ex ), ZSTR_KNOWN (ZEND_STR_PREVIOUS ), 1 , & rv );
129
+ ZVAL_DEREF (previous );
127
130
if (Z_TYPE_P (previous ) == IS_NULL ) {
128
131
zend_update_property_ex (base_ce , Z_OBJ_P (ex ), ZSTR_KNOWN (ZEND_STR_PREVIOUS ), & pv );
129
132
GC_DELREF (add_previous );
@@ -630,6 +633,7 @@ ZEND_METHOD(Exception, getTraceAsString)
630
633
RETURN_THROWS ();
631
634
}
632
635
636
+ ZVAL_DEREF (trace );
633
637
/* Type should be guaranteed by property type. */
634
638
ZEND_ASSERT (Z_TYPE_P (trace ) == IS_ARRAY );
635
639
RETURN_NEW_STR (zend_trace_to_string (Z_ARRVAL_P (trace ), /* include_main */ true));
@@ -643,7 +647,7 @@ ZEND_METHOD(Exception, getPrevious)
643
647
644
648
ZEND_PARSE_PARAMETERS_NONE ();
645
649
646
- ZVAL_COPY (return_value , GET_PROPERTY_SILENT (ZEND_THIS , ZEND_STR_PREVIOUS ));
650
+ ZVAL_COPY_DEREF (return_value , GET_PROPERTY_SILENT (ZEND_THIS , ZEND_STR_PREVIOUS ));
647
651
} /* }}} */
648
652
649
653
/* {{{ Obtain the string representation of the Exception object */
@@ -723,21 +727,23 @@ ZEND_METHOD(Exception, __toString)
723
727
724
728
Z_PROTECT_RECURSION_P (exception );
725
729
exception = GET_PROPERTY (exception , ZEND_STR_PREVIOUS );
726
- if (exception && Z_TYPE_P (exception ) == IS_OBJECT && Z_IS_RECURSIVE_P (exception )) {
730
+ ZVAL_DEREF (exception );
731
+ if (Z_TYPE_P (exception ) == IS_OBJECT && Z_IS_RECURSIVE_P (exception )) {
727
732
break ;
728
733
}
729
734
}
730
735
zend_string_release_ex (fname , 0 );
731
736
732
737
exception = ZEND_THIS ;
733
738
/* Reset apply counts */
734
- while (exception && Z_TYPE_P (exception ) == IS_OBJECT && (base_ce = i_get_exception_base (Z_OBJ_P (exception ))) && instanceof_function (Z_OBJCE_P (exception ), base_ce )) {
739
+ while (Z_TYPE_P (exception ) == IS_OBJECT && (base_ce = i_get_exception_base (Z_OBJ_P (exception ))) && instanceof_function (Z_OBJCE_P (exception ), base_ce )) {
735
740
if (Z_IS_RECURSIVE_P (exception )) {
736
741
Z_UNPROTECT_RECURSION_P (exception );
737
742
} else {
738
743
break ;
739
744
}
740
745
exception = GET_PROPERTY (exception , ZEND_STR_PREVIOUS );
746
+ ZVAL_DEREF (exception );
741
747
}
742
748
743
749
exception = ZEND_THIS ;
0 commit comments