Use safe dtor for previous and message

nielsdos · nielsdos · commit 88e2844bd757 · 2025-05-06T20:51:15.000+02:00
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -321,7 +321,7 @@ ZEND_METHOD(Exception, __construct)
 
 	if (message) {
 		zval *tmp = zend_obj_prop_num_checked(Z_OBJ_P(object), 0, ZSTR_KNOWN(ZEND_STR_MESSAGE));
-		zval_ptr_dtor(tmp);
+		zval_ptr_safe_dtor(tmp);
 		ZVAL_STR_COPY(tmp, message);
 	}
 
@@ -333,7 +333,7 @@ ZEND_METHOD(Exception, __construct)
 
 	if (previous) {
 		zval *tmp = zend_obj_prop_num_checked(Z_OBJ_P(object), 6, ZSTR_KNOWN(ZEND_STR_PREVIOUS));
-		zval_ptr_dtor(tmp);
+		zval_ptr_safe_dtor(tmp);
 		ZVAL_COPY(tmp, previous);
 	}
 }
@@ -374,7 +374,7 @@ ZEND_METHOD(ErrorException, __construct)
 
 	if (message) {
 		zval *tmp = zend_obj_prop_num_checked(Z_OBJ_P(object), 0, ZSTR_KNOWN(ZEND_STR_MESSAGE));
-		zval_ptr_dtor(tmp);
+		zval_ptr_safe_dtor(tmp);
 		ZVAL_STR_COPY(tmp, message);
 	}
 
@@ -386,7 +386,7 @@ ZEND_METHOD(ErrorException, __construct)
 
 	if (previous) {
 		zval *tmp = zend_obj_prop_num_checked(Z_OBJ_P(object), 6, ZSTR_KNOWN(ZEND_STR_PREVIOUS));
-		zval_ptr_dtor(tmp);
+		zval_ptr_safe_dtor(tmp);
 		ZVAL_COPY(tmp, previous);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ ZEND_METHOD(Exception, __construct)`
`321`	`321`
`322`	`322`	`if (message) {`
`323`	`323`	`zval *tmp = zend_obj_prop_num_checked(Z_OBJ_P(object), 0, ZSTR_KNOWN(ZEND_STR_MESSAGE));`
`324`		`- zval_ptr_dtor(tmp);`
	`324`	`+ zval_ptr_safe_dtor(tmp);`
`325`	`325`	`ZVAL_STR_COPY(tmp, message);`
`326`	`326`	`}`
`327`	`327`
`@@ -333,7 +333,7 @@ ZEND_METHOD(Exception, __construct)`
`333`	`333`
`334`	`334`	`if (previous) {`
`335`	`335`	`zval *tmp = zend_obj_prop_num_checked(Z_OBJ_P(object), 6, ZSTR_KNOWN(ZEND_STR_PREVIOUS));`
`336`		`- zval_ptr_dtor(tmp);`
	`336`	`+ zval_ptr_safe_dtor(tmp);`
`337`	`337`	`ZVAL_COPY(tmp, previous);`
`338`	`338`	`}`
`339`	`339`	`}`
`@@ -374,7 +374,7 @@ ZEND_METHOD(ErrorException, __construct)`
`374`	`374`
`375`	`375`	`if (message) {`
`376`	`376`	`zval *tmp = zend_obj_prop_num_checked(Z_OBJ_P(object), 0, ZSTR_KNOWN(ZEND_STR_MESSAGE));`
`377`		`- zval_ptr_dtor(tmp);`
	`377`	`+ zval_ptr_safe_dtor(tmp);`
`378`	`378`	`ZVAL_STR_COPY(tmp, message);`
`379`	`379`	`}`
`380`	`380`
`@@ -386,7 +386,7 @@ ZEND_METHOD(ErrorException, __construct)`
`386`	`386`
`387`	`387`	`if (previous) {`
`388`	`388`	`zval *tmp = zend_obj_prop_num_checked(Z_OBJ_P(object), 6, ZSTR_KNOWN(ZEND_STR_PREVIOUS));`
`389`		`- zval_ptr_dtor(tmp);`
	`389`	`+ zval_ptr_safe_dtor(tmp);`
`390`	`390`	`ZVAL_COPY(tmp, previous);`
`391`	`391`	`}`
`392`	`392`