com php-src: Fix Bug #71089 No check to duplicate zend_extens ion: Zend/zend_extensions.c
| From: | Remi Collet | Date: | Fri, 11 Dec 2015 12:21:24 +0000 |
| Subject: | com php-src: Fix Bug #71089 No check to duplicate zend_extens ion: Zend/zend_extensions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90225@lists.php.net to get a copy of this message | ||
Commit: 410eacc1a9b50ec3cb6c5fc0ff252516d0c0a4f1
Author: Remi Collet <remi@php.net> Fri, 11 Dec 2015 13:21:24 +0100
Parents: 7d5dbaed765c8b8f2bbf3f6159a4658686245a9b
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=410eacc1a9b50ec3cb6c5fc0ff252516d0c0a4f1
Log:
Fix Bug #71089 No check to duplicate zend_extension
Bugs:
https://bugs.php.net/71089
Changed paths:
M Zend/zend_extensions.c
Diff:
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index 8321f1c..fbf1f32 100644
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -105,6 +105,14 @@ int zend_load_extension(const char *path)
#endif
DL_UNLOAD(handle);
return FAILURE;
+ } else if (zend_get_extension(new_extension->name)) {
+ fprintf(stderr, "Cannot load %s - extension already loaded\n", new_extension->name);
+/* See http://support.microsoft.com/kb/190351
*/
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
+ DL_UNLOAD(handle);
+ return FAILURE;
}
return zend_register_extension(new_extension, handle);