Fix prototype (may have caused stack corruption)

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 48f2712d0a8ffb1d96ba1e9ceadce2e444fd7ceb..6ec60239ad8d7962c53fe5d2b84d35cd6a6ed642 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -816,7 +816,7 @@ ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_fu
 }
 
 
-static int zend_hash_replace_checker_wrapper(HashTable *target, void *source_data, Bucket *p, void *pParam, merge_checker_func_t merge_checker_func)
+static zend_bool zend_hash_replace_checker_wrapper(HashTable *target, void *source_data, Bucket *p, void *pParam, merge_checker_func_t merge_checker_func)
 {
        zend_hash_key hash_key;
 

diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 29f5d21c0990f99c5c0e26ac68b831528b9b58c2..37a84cb95665225de7c5b28229b53bcdc0bee7cb 100644 (file)
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -83,7 +83,7 @@ typedef struct _zend_hash_key {
 } zend_hash_key;
 
 
-typedef int (*merge_checker_func_t)(HashTable *target_ht, void *source_data, zend_hash_key *hash_key, void *pParam);
+typedef zend_bool (*merge_checker_func_t)(HashTable *target_ht, void *source_data, zend_hash_key *hash_key, void *pParam);
 
 typedef Bucket* HashPosition;