Imported Upstream version 5.4.8upstream/5.4.8

4 files changed, 15 insertions, 14 deletions

diff --git a/win32/build/deplister.c b/win32/build/deplister.c
index bf91b96d5..f99da5122 100644
--- a/win32/build/deplister.c
+++ b/win32/build/deplister.c
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2010 The PHP Group                                |
+  | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index 39281d738..922245d85 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -1,16 +1,16 @@
 bz2-1.0.6

 cclient-2007e

 freetype-2.4.3

-icu-4.6.1

+icu-49.1.2

 jpeglib-6b

-libcurl-7.24.0

-libiconv-1.11

+libcurl-7.27.0

+libiconv-1.14

 libmcrypt-2.5.8

-libmpir-1.3.1

+libmpir-2.5.1

 libpng-1.2.46

 libpq-8.3.6

-libssh2-1.3.0

+libssh2-1.4.2

 libtidy-20090325

-libxslt-1.1.23

-libxml-2.7.7

-openssl-0.9.8u

+libxslt-1.1.27

+libxml-2.7.8

+openssl-0.9.8x

diff --git a/win32/build/template.rc b/win32/build/template.rc
index 2db889649..606b08a24 100644
--- a/win32/build/template.rc
+++ b/win32/build/template.rc
@@ -65,7 +65,7 @@ BEGIN
 #endif
             VALUE "FileVersion", EXT_VERSION
             VALUE "InternalName", INTERNAL_NAME
-            VALUE "LegalCopyright", "Copyright © 1997-2010 The PHP Group"
+            VALUE "LegalCopyright", "Copyright © 1997-2012 The PHP Group"
             VALUE "LegalTrademarks", "PHP"
             VALUE "OriginalFilename", FILE_NAME
             VALUE "ProductName", "PHP"
diff --git a/win32/registry.c b/win32/registry.c
index 45e842b45..638d85ae5 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;