diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-01-10 18:54:37 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-01-10 18:54:37 +0400 |
| commit | 52dd0d1c73e6b67eaad256cb1349e314408d2bc8 (patch) | |
| tree | be99ac7d243e37ee4f906cc2d9459ee9edfaaea0 | |
| parent | f787e21ef5fdcd1a2ec94bc341ba48a83c743e32 (diff) | |
| parent | 046ae2f77ca36366008690edc4b35ddd2c8f9fc7 (diff) | |
| download | php-git-52dd0d1c73e6b67eaad256cb1349e314408d2bc8.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed uninitialized zval.type (Yoram)
| -rw-r--r-- | win32/registry.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/win32/registry.c b/win32/registry.c index 638d85ae52..685a09d084 100644 --- a/win32/registry.c +++ b/win32/registry.c @@ -91,6 +91,7 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_ INIT_PZVAL(data); Z_STRVAL_P(data) = zend_strndup(value, value_len-1); Z_STRLEN_P(data) = value_len-1; + Z_TYPE_P(data) = IS_STRING; zend_hash_update(ht, name, name_len+1, &data, sizeof(zval*), NULL); } } |