Fixed a crash inside php_imagettftext_common();

Ilia Alshanetsky · Ilia Alshanetsky · commit aeadf9bd4aca · 2003-06-19T15:47:46.000Z
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -3107,8 +3107,9 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
 			do {
 				zval ** item;
 				char * key;
+				ulong num_key;
 
-				if (zend_hash_get_current_key_ex(HASH_OF(*EXT), &key, NULL, NULL, 0, &pos) == FAILURE) {
+				if (zend_hash_get_current_key_ex(HASH_OF(*EXT), &key, NULL, &num_key, 0, &pos) != HASH_KEY_IS_STRING) {
 					continue;
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -3107,8 +3107,9 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int`
`3107`	`3107`	`do {`
`3108`	`3108`	`zval ** item;`
`3109`	`3109`	`char * key;`
	`3110`	`+ ulong num_key;`
`3110`	`3111`
`3111`		`- if (zend_hash_get_current_key_ex(HASH_OF(*EXT), &key, NULL, NULL, 0, &pos) == FAILURE) {`
	`3112`	`+ if (zend_hash_get_current_key_ex(HASH_OF(*EXT), &key, NULL, &num_key, 0, &pos) != HASH_KEY_IS_STRING) {`
`3112`	`3113`	`continue;`
`3113`	`3114`	`}`
`3114`	`3115`