Minor fix and improvement

cmb69 · cmb69 · commit 859f4726664f · 2024-10-14T19:20:37.000+02:00
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
@@ -810,9 +810,8 @@ static bool zlib_create_dictionary_string(HashTable *options, char **dict, size_
 
 					zval *cur;
 					ZEND_HASH_FOREACH_VAL(dictionary, cur) {
-						zend_string *string = zval_get_string(cur);
-						ZEND_ASSERT(string);
-						if (EG(exception)) {
+						zend_string *string = zval_try_get_string(cur);
+						if (string == NULL) {
 							result = 0;
 							break;
 						}
@@ -855,6 +854,7 @@ static bool zlib_create_dictionary_string(HashTable *options, char **dict, size_
 				return 0;
 		}
 	}
+	return 1;
 }
 
 /* {{{ Initialize an incremental inflate context with the specified encoding */

Original file line number	Diff line number	Diff line change
`@@ -810,9 +810,8 @@ static bool zlib_create_dictionary_string(HashTable options, char *dict, size_`
`810`	`810`
`811`	`811`	`zval *cur;`
`812`	`812`	`ZEND_HASH_FOREACH_VAL(dictionary, cur) {`
`813`		`- zend_string *string = zval_get_string(cur);`
`814`		`- ZEND_ASSERT(string);`
`815`		`- if (EG(exception)) {`
	`813`	`+ zend_string *string = zval_try_get_string(cur);`
	`814`	`+ if (string == NULL) {`
`816`	`815`	`result = 0;`
`817`	`816`	`break;`
`818`	`817`	`}`
`@@ -855,6 +854,7 @@ static bool zlib_create_dictionary_string(HashTable options, char *dict, size_`
`855`	`854`	`return 0;`
`856`	`855`	`}`
`857`	`856`	`}`
	`857`	`+ return 1;`
`858`	`858`	`}`
`859`	`859`
`860`	`860`	`/* {{{ Initialize an incremental inflate context with the specified encoding */`