Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed uninitialized zval.type (Yoram)
This commit is contained in:
Dmitry Stogov 2013-01-10 18:54:37 +04:00
commit 52dd0d1c73

View File

@ -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);
}
}