Update ext/standard/var.c

Girgias · TysonAndre · web-flow · commit e94cd605e7f5 · 2022-11-21T11:33:15.000Z
Co-authored-by: Tyson Andre &lt;tyson.andre@uwaterloo.ca&gt;
diff --git a/ext/standard/var.c b/ext/standard/var.c
@@ -770,7 +770,7 @@ static HashTable* php_var_serialize_call_sleep(zend_object *obj, zend_function *
 	zend_call_known_instance_method(fn, obj, &retval, /* param_count */ 0, /* params */ NULL);
 	BG(serialize_lock)--;
 
-	if (Z_ISUNDEF(retval)) {
+	if (Z_ISUNDEF(retval) || EG(exception)) {
 		zval_ptr_dtor(&retval);
 		return NULL;
 	}

Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,7 @@ static HashTable* php_var_serialize_call_sleep(zend_object obj, zend_function `
`770`	`770`	`zend_call_known_instance_method(fn, obj, &retval, /* param_count / 0, / params */ NULL);`
`771`	`771`	`BG(serialize_lock)--;`
`772`	`772`
`773`		`- if (Z_ISUNDEF(retval)) {`
	`773`	`+ if (Z_ISUNDEF(retval) \|\| EG(exception)) {`
`774`	`774`	`zval_ptr_dtor(&retval);`
`775`	`775`	`return NULL;`
`776`	`776`	`}`