summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2003-06-19 15:48:09 +0000
committerIlia Alshanetsky <iliaa@php.net>2003-06-19 15:48:09 +0000
commitda55120b84cb3e43fc35a8815b5cfb61897aab6d (patch)
tree7c3e6ec0b71a6b8e93e5b4c98a4c700e4f299f68
parentb1c0e42d00213150e1f7717ff2a9508660747adf (diff)
downloadphp-git-da55120b84cb3e43fc35a8815b5cfb61897aab6d.tar.gz
MFH: Fixed a crash inside php_imagettftext_common();
-rw-r--r--ext/gd/gd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index d4bb5b5402..ffe401387d 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3012,8 +3012,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;
if (zend_hash_get_current_data_ex(HASH_OF(*EXT), (void**)&item, &pos) == FAILURE)