Commit: de884997e0bc5cfc49b955099f369d1beae941b0 Author: Felipe Pena <felipe...@gmail.com> Thu, 30 Aug 2012 09:32:13 -0300 Parents: 0410b4e60f6b4b3a105c0866b797dc47a58ec594 Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de884997e0bc5cfc49b955099f369d1beae941b0 Log: - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry) Bugs: https://bugs.php.net/62955 Changed paths: M win32/registry.c Diff: diff --git a/win32/registry.c b/win32/registry.c index 45e842b..638d85a 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; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
