Skip to content

fix: preserve PHP 7.1 ZTS property names #4185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morrisonlevi wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −1
Open

fix: preserve PHP 7.1 ZTS property names #4185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34667bb
fix: preserve PHP 7.1 ZTS property names
morrisonlevi Sep 10, 2026
e1e74cc
Merge branch 'master' into levi/repro-7.1-zts-uaf-fix
morrisonlevi Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion ext/compatibility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,29 @@ static inline const zend_function *dd_zend_get_closure_method_def(zend_object *o

#define ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, classname, allow_null, default_value) ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null)
#define ZEND_ARG_OBJ_TYPE_MASK(pass_by_ref, name, class_name, type_mask, default_value) ZEND_ARG_INFO(pass_by_ref, name)
#define zend_declare_typed_property(ce, name, default, visibility, doc_comment, type) zend_declare_property_ex(ce, name, default, visibility, doc_comment); (void)type

#if PHP_VERSION_ID >= 70100 && PHP_VERSION_ID < 70200 && defined(ZTS)
/* PHP 7.1 ZTS destroys its process-wide interned strings before destroying the
* main thread's copied class table. A typed-property stub may pass ZSTR_KNOWN()
* here, leaving the copied property info pointing at an already-freed string
* during tsrm_shutdown(). Store a regular persistent string instead. */
static inline int datadog_declare_property_ex(zend_class_entry *ce, zend_string *name, zval *property,
int access_type, zend_string *doc_comment) {
if (!ZSTR_IS_INTERNED(name)) {
return zend_declare_property_ex(ce, name, property, access_type, doc_comment);
}

zend_string *persistent_name = zend_string_init(ZSTR_VAL(name), ZSTR_LEN(name), true);
int result = zend_declare_property_ex(ce, persistent_name, property, access_type, doc_comment);
zend_string_release_ex(persistent_name, true);
return result;
}
#define zend_declare_typed_property(ce, name, default, visibility, doc_comment, type) \
datadog_declare_property_ex(ce, name, default, visibility, doc_comment); (void)type
#else
#define zend_declare_typed_property(ce, name, default, visibility, doc_comment, type) \
zend_declare_property_ex(ce, name, default, visibility, doc_comment); (void)type
#endif
#define ZEND_TYPE_INIT_MASK(type) NULL
#define ZEND_TYPE_INIT_CLASS(class_name, allow_null, extra_flags) NULL; zend_string_release(class_name)

Expand Down
Loading