Skip to content

Commit 6953dd6

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix incorrect dtor for persistent sdl->encoders
2 parents 7d67b19 + 07de4b6 commit 6953dd6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ PHP NEWS
4444
. Fix incorrect uri check in SOAP caching. (nielsdos)
4545
. Fix segfault and assertion failure with refcounted props and arrays.
4646
(nielsdos)
47+
. Fix potential crash with an edge case of persistent encoders. (nielsdos)
4748

4849
- Streams:
4950
. Fixed bug #75708 (getimagesize with "&$imageinfo" fails on StreamWrappers).

ext/soap/php_sdl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type)
155155
}
156156
if (sdl->encoders == NULL) {
157157
sdl->encoders = pemalloc(sizeof(HashTable), sdl->is_persistent);
158-
zend_hash_init(sdl->encoders, 0, NULL, delete_encoder, sdl->is_persistent);
158+
zend_hash_init(sdl->encoders, 0, NULL, sdl->is_persistent ? delete_encoder_persistent : delete_encoder, sdl->is_persistent);
159159
}
160160
zend_hash_str_update_ptr(sdl->encoders, nscat, len, new_enc);
161161
enc = new_enc;

0 commit comments

Comments
 (0)