Merge branch 'PHP-5.4' into PHP-5.5

dstogov · dstogov · commit 52dd0d1c73e6 · 2013-01-10T18:54:37.000+04:00
* PHP-5.4:
  Fixed uninitialized zval.type (Yoram)
diff --git 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);
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ static int LoadDirectory(HashTable directories, HKEY key, char path, int path_`
`91`	`91`	`INIT_PZVAL(data);`
`92`	`92`	`Z_STRVAL_P(data) = zend_strndup(value, value_len-1);`
`93`	`93`	`Z_STRLEN_P(data) = value_len-1;`
	`94`	`+ Z_TYPE_P(data) = IS_STRING;`
`94`	`95`	`zend_hash_update(ht, name, name_len+1, &data, sizeof(zval*), NULL);`
`95`	`96`	`}`
`96`	`97`	`}`