diff options
| author | Pierre Joye <pajoye@php.net> | 2009-10-21 06:42:08 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2009-10-21 06:42:08 +0000 |
| commit | 26270b4fd7e864646fdb77e9fc6da29fcd31d229 (patch) | |
| tree | da4a0f91c1df73d6e0a7e290c212a635c149e0a0 | |
| parent | 8df115c25efbdafa70f71ed77f979fc7db2aa3bc (diff) | |
| download | php-git-26270b4fd7e864646fdb77e9fc6da29fcd31d229.tar.gz | |
- fix leak in DL on error (windows)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/standard/dl.c | 10 |
2 files changed, 13 insertions, 0 deletions
@@ -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; } |