Merge branch 'PHP-8.3'

* PHP-8.3:
  Fix incorrect dtor for persistent sdl->encoders
This commit is contained in:
Niels Dossche 2023-10-25 17:56:53 +02:00
commit b7bf5e5706

View file

@ -164,7 +164,7 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type)
} }
if (sdl->encoders == NULL) { if (sdl->encoders == NULL) {
sdl->encoders = pemalloc(sizeof(HashTable), sdl->is_persistent); sdl->encoders = pemalloc(sizeof(HashTable), sdl->is_persistent);
zend_hash_init(sdl->encoders, 0, NULL, delete_encoder, sdl->is_persistent); zend_hash_init(sdl->encoders, 0, NULL, sdl->is_persistent ? delete_encoder_persistent : delete_encoder, sdl->is_persistent);
} }
zend_hash_str_update_ptr(sdl->encoders, nscat, len, new_enc); zend_hash_str_update_ptr(sdl->encoders, nscat, len, new_enc);
enc = new_enc; enc = new_enc;