From: Pierre Joye <pajoye@php.net>
Date: Wed, 21 Oct 2009 06:42:08 +0000 (+0000)
Subject: - fix leak in DL on error (windows)
X-Git-Tag: php-5.3.2RC1~326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26270b4fd7e864646fdb77e9fc6da29fcd31d229;p=php

- fix leak in DL on error (windows)
---

diff --git a/NEWS b/NEWS
index 34be2a38c5..65d7df6bdb 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ PHP                                                                        NEWS
 - Implemented FR #49253 (added support for libcurl's CERTINFO option).
   (Linus Nielsen Feltzing <linus@haxx.se>)
   
+- Fixed memory leak in extension loading when an error occurs on Windows.
+  (Pierre)
+
 - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
   sjoerd at php dot net)
 - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 5119bf4163..ebd626a48f 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -146,8 +146,18 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now TSRMLS_DC)
 	/* load dynamic symbol */
 	handle = DL_LOAD(libpath);
 	if (!handle) {
+#if PHP_WIN32
+		char *err = GET_DL_ERROR();
+		if (err) {
+			php_error_docref(NULL TSRMLS_CC, error_type, "Unable to load dynamic library '%s' - %s", libpath, err);
+			LocalFree(err);
+		} else {
+			php_error_docref(NULL TSRMLS_CC, error_type, "Unable to load dynamic library '%s' - %s", libpath, "Unknown reason");
+		}
+#else
 		php_error_docref(NULL TSRMLS_CC, error_type, "Unable to load dynamic library '%s' - %s", libpath, GET_DL_ERROR());
 		GET_DL_ERROR(); /* free the buffer storing the error */
+#endif
 		efree(libpath);
 		return FAILURE;
 	}