Merge branch 'PHP-8.2' into PHP-8.3

nielsdos · nielsdos · commit 6953dd658c1a · 2023-10-25T17:56:41.000+02:00
* PHP-8.2:
  Fix incorrect dtor for persistent sdl-&gt;encoders
diff --git a/NEWS b/NEWS
@@ -44,6 +44,7 @@ PHP                                                                        NEWS
   . Fix incorrect uri check in SOAP caching. (nielsdos)
   . Fix segfault and assertion failure with refcounted props and arrays.
     (nielsdos)
+  . Fix potential crash with an edge case of persistent encoders. (nielsdos)
 
 - Streams:
   . Fixed bug #75708 (getimagesize with "&$imageinfo" fails on StreamWrappers).
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
@@ -155,7 +155,7 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type)
 			}
 			if (sdl->encoders == NULL) {
 				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);
 			enc = new_enc;

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ encodePtr get_encoder(sdlPtr sdl, const char ns, const char type)`
`155`	`155`	`}`
`156`	`156`	`if (sdl->encoders == NULL) {`
`157`	`157`	`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);`
`159`	`159`	`}`
`160`	`160`	`zend_hash_str_update_ptr(sdl->encoders, nscat, len, new_enc);`
`161`	`161`	`enc = new_enc;`