Fix SIGABRT in PHP 8.4

michael-grunder · michael-grunder · commit a75a7e5a361b · 2024-09-19T22:41:28.000-07:00
PHP switched from `ZEND_ASSUME` to `ZEND_ASSERT` when making sure `Z_PTR_P(zv)` was nonnull in `zend_hash_str_update_ptr`. This commit just switches to `zend_hash_str_add_empty_element` which is semantically more correct anyway. Fixes #2539
diff --git a/cluster_library.c b/cluster_library.c
@@ -2995,7 +2995,7 @@ static zend_string **get_valid_seeds(HashTable *input, uint32_t *nseeds) {
         }
 
         /* Add as a key to avoid duplicates */
-        zend_hash_str_update_ptr(valid, Z_STRVAL_P(z_seed), Z_STRLEN_P(z_seed), NULL);
+        zend_hash_str_add_empty_element(valid, Z_STRVAL_P(z_seed), Z_STRLEN_P(z_seed));
     } ZEND_HASH_FOREACH_END();
 
     /* We need at least one valid seed */

Original file line number	Diff line number	Diff line change
`@@ -2995,7 +2995,7 @@ static zend_string *get_valid_seeds(HashTable input, uint32_t *nseeds) {`
`2995`	`2995`	`}`
`2996`	`2996`
`2997`	`2997`	`/* Add as a key to avoid duplicates */`
`2998`		`- zend_hash_str_update_ptr(valid, Z_STRVAL_P(z_seed), Z_STRLEN_P(z_seed), NULL);`
	`2998`	`+ zend_hash_str_add_empty_element(valid, Z_STRVAL_P(z_seed), Z_STRLEN_P(z_seed));`
`2999`	`2999`	`} ZEND_HASH_FOREACH_END();`
`3000`	`3000`
`3001`	`3001`	`/* We need at least one valid seed */`