Fix zend_lazy_object_get_properties for object with prop ht, when init fails #15825
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
zend_lazy_object_get_properties()
is used byzend_std_get_properties_ex()
to fetch the properties of lazy objects. It initializes the object and returns its properties.When initialization fails we return an empty array instead because most callers do not check for NULL. We rely on the exception thrown during initialization. We also assign that empty array to
zend_object.properties
for the same reasons.We asserted that
zend_object.properties
was eitherNULL
or&zend_empty_array
, but there are other cases in which a uninitialized lazy object may have a properties ht.Here I remove the assertion, and return the existing properties ht if there is one. Otherwise I return
zend_new_array(0)
instead of&zend_emtpy_array
as not all callers expect an immutable array (e.g. FE_FETCH does not).Fixes GH-15823.