diff options
Diffstat (limited to 'ext/soap/php_sdl.c')
| -rw-r--r-- | ext/soap/php_sdl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 1a464167c7..0441e53d52 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -2397,12 +2397,6 @@ static void make_persistent_restriction_char_int(sdlRestrictionCharPtr *rest) } -static void make_persistent_restriction_char(zval *zv) -{ - make_persistent_restriction_char_int((sdlRestrictionCharPtr*)&Z_PTR_P(zv)); -} - - static void make_persistent_sdl_type_ref(sdlTypePtr *type, HashTable *ptr_map, HashTable *bp_types) { sdlTypePtr tmp; @@ -2764,9 +2758,15 @@ static sdlTypePtr make_persistent_sdl_type(sdlTypePtr type, HashTable *ptr_map, } if (type->restrictions->enumeration) { + sdlRestrictionCharPtr tmp, penum; ptype->restrictions->enumeration = malloc(sizeof(HashTable)); zend_hash_init(ptype->restrictions->enumeration, zend_hash_num_elements(type->restrictions->enumeration), NULL, delete_restriction_var_char_persistent, 1); - zend_hash_copy(ptype->restrictions->enumeration, type->restrictions->enumeration, make_persistent_restriction_char); + ZEND_HASH_FOREACH_STR_KEY_PTR(type->restrictions->enumeration, key, tmp) { + penum = tmp; + make_persistent_restriction_char_int(&penum); + /* We have to duplicate key emalloc->malloc */ + zend_hash_str_add_ptr(ptype->restrictions->enumeration, ZSTR_VAL(key), ZSTR_LEN(key), penum); + } ZEND_HASH_FOREACH_END(); } } |