Skip to content

Fix soap crash with ZEND_RC_DEBUG #12514

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.

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

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion ext/soap/php_sdl.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,13 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type)
new_enc->details.type_str = estrdup(new_enc->details.type_str);
}
if (new_enc->details.clark_notation) {
zend_string_addref(new_enc->details.clark_notation);
/* If it was persistent or becomes persistent, we must dup. Otherwise we can copy. */
bool was_persistent = GC_FLAGS(new_enc->details.clark_notation) & IS_STR_PERSISTENT;
if (was_persistent || sdl->is_persistent) {
new_enc->details.clark_notation = zend_string_dup(new_enc->details.clark_notation, sdl->is_persistent);
} else {
zend_string_addref(new_enc->details.clark_notation);
}
}
if (sdl->encoders == NULL) {
sdl->encoders = pemalloc(sizeof(HashTable), sdl->is_persistent);
Expand Down