Add non-NULL assertion to zend_get_gc_buffer_add_obj() (#17671)

nielsdos · web-flow · commit 50ed7b58bfcd · 2025-02-02T19:09:53.000+01:00
This would've saved me time when fixing the nightly failure in Laravel [1]. [1] e306a2e
diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h
@@ -134,6 +134,8 @@ static zend_always_inline void zend_get_gc_buffer_add_zval(
 
 static zend_always_inline void zend_get_gc_buffer_add_obj(
 		zend_get_gc_buffer *gc_buffer, zend_object *obj) {
+	ZEND_ASSERT(obj != NULL);
+
 	if (UNEXPECTED(gc_buffer->cur == gc_buffer->end)) {
 		zend_get_gc_buffer_grow(gc_buffer);
 	}

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,8 @@ static zend_always_inline void zend_get_gc_buffer_add_zval(`
`134`	`134`
`135`	`135`	`static zend_always_inline void zend_get_gc_buffer_add_obj(`
`136`	`136`	`zend_get_gc_buffer gc_buffer, zend_object obj) {`
	`137`	`+ ZEND_ASSERT(obj != NULL);`
	`138`	`+`
`137`	`139`	`if (UNEXPECTED(gc_buffer->cur == gc_buffer->end)) {`
`138`	`140`	`zend_get_gc_buffer_grow(gc_buffer);`
`139`	`141`	`}`