iliaa           Thu Jun 19 11:47:46 2003 EDT

  Modified files:              
    /php4/ext/gd        gd.c 
  Log:
  Fixed a crash inside php_imagettftext_common();
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.274 php4/ext/gd/gd.c:1.275
--- php4/ext/gd/gd.c:1.274      Sun Jun 15 16:00:08 2003
+++ php4/ext/gd/gd.c    Thu Jun 19 11:47:46 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: gd.c,v 1.274 2003/06/15 20:00:08 helly Exp $ */
+/* $Id: gd.c,v 1.275 2003/06/19 15:47:46 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
    Cold Spring Harbor Labs. */
@@ -3107,8 +3107,9 @@
                        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;
                                }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to