com php-src: - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry): win32/registry.c
| From: | Stanislav Malyshev | Date: | Sun, 09 Sep 2012 21:54:13 +0000 |
| Subject: | com php-src: - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry): win32/registry.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70139@lists.php.net to get a copy of this message | ||
Commit: d1b8eeb2d8dda8bc2697d0dcea9c129f6fc77b9a
Author: Felipe Pena <felipensp@gmail.com> Thu, 30 Aug 2012 09:32:13 -0300
Committer: Stanislav Malyshev <stas@php.net> Sun, 9 Sep 2012 14:54:13 -0700
Parents: 7fcf36cfef896da78d64f656d975ece7d48aa359
Branches: PHP-5.4.7
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d1b8eeb2d8dda8bc2697d0dcea9c129f6fc77b9a
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;