From de884997e0bc5cfc49b955099f369d1beae941b0 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Thu, 30 Aug 2012 09:32:13 -0300 Subject: - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry) --- win32/registry.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'win32') diff --git a/win32/registry.c b/win32/registry.c index 45e842b455..638d85ae52 100644 --- a/win32/registry.c +++ b/win32/registry.c @@ -77,12 +77,13 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_ value_len = max_value+1; if (RegEnumValue(key, i, name, &name_len, NULL, &type, value, &value_len) == ERROR_SUCCESS) { if ((type == REG_SZ) || (type == REG_EXPAND_SZ)) { - ht = (HashTable*)malloc(sizeof(HashTable)); if (!ht) { - return ret; + ht = (HashTable*)malloc(sizeof(HashTable)); + if (!ht) { + return ret; + } + zend_hash_init(ht, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1); } - zend_hash_init(ht, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1); - data = (zval*)malloc(sizeof(zval)); if (!data) { return ret; -- cgit v1.2.1