-fix bug 54935, php_win_err can lead to crash

diff --git a/NEWS b/NEWS
index 135b4a69523b4ff300b4fb04e6156bbe3224ea3d..25cb3b0df79601934da1a28b4fe04ebc3453ed8d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,10 +21,13 @@ PHP                                                                        NEWS
     (Dmitry)
 
 - Core:
-  . Fixed a crash inside dtor for error handling. (Ilia)
   . Implemented FR #54459 (Range function accuracy). (Adam)
   . Added PHP_MANDIR constant telling where the manpages were installed into,
     and an --man-dir argument to php-config. (Hannes)
+
+  . Fixed a crash inside dtor for error handling. (Ilia)
+
+  . Fixed bug #54935 php_win_err can lead to crash. (Pierre)
   . Fixed bug #54895 (Fix compiling with older gcc version without need for
     membar_producer macro). (mhei at heimpold dot de)
   . Fixed bug #54723 (getimagesize() doesn't check the full ico signature).
@@ -35,13 +38,13 @@ PHP                                                                        NEWS
     (CVE-2011-1148)
   . Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
     (tomas dot brastavicius at quantum dot lt, Pierrick)
-  . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using 
-    TMPDIR on Windows). (Pierre)
   . Fixed bug #54866 (incorrect accounting for realpath_cache_size) (Dustin Ward)
   . Fixed bug #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt size) 
     (Pierre, os at irj dot ru)
   . Fixed bug #50363 (Invalid parsing in convert.quoted-printable-decode filter).
     (slusarz at curecanti dot org)
+  . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using 
+    TMPDIR on Windows). (Pierre)
 
 - Apache2 Handler SAPI:
   . Fixed bug #54529 (SAPI crashes on apache_config.c:197).

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index c7c4df399d030e1afd0e9aeec06f5e2de0da0595..b1555ea365ea97277fe484e9c26f47db892c8456 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -148,7 +148,7 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now TSRMLS_DC)
        if (!handle) {
 #if PHP_WIN32
                char *err = GET_DL_ERROR();
-               if (err) {
+               if (err && (*err != "")) {
                        php_error_docref(NULL TSRMLS_CC, error_type, "Unable to load dynamic library '%s' - %s", libpath, err);
                        LocalFree(err);
                } else {