From: Remi Collet <remi@php.net>
Date: Fri, 11 Dec 2015 12:21:24 +0000 (+0100)
Subject: Fix Bug #71089 No check to duplicate zend_extension
X-Git-Tag: php-7.0.2RC1~35^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=410eacc1a9b50ec3cb6c5fc0ff252516d0c0a4f1;p=php

Fix Bug #71089 No check to duplicate zend_extension
---

diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index 8321f1ce83..fbf1f327a6 100644
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -100,6 +100,14 @@ int zend_load_extension(const char *path)
 		fprintf(stderr, "Cannot load %s - it was built with configuration %s, whereas running engine is %s\n",
 					new_extension->name, extension_version_info->build_id, ZEND_EXTENSION_BUILD_ID);
 /* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+		fflush(stderr);
+#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