af9dc8
From 410eacc1a9b50ec3cb6c5fc0ff252516d0c0a4f1 Mon Sep 17 00:00:00 2001
af9dc8
From: Remi Collet <remi@php.net>
af9dc8
Date: Fri, 11 Dec 2015 13:21:24 +0100
af9dc8
Subject: [PATCH] Fix Bug #71089 No check to duplicate zend_extension
af9dc8
af9dc8
---
af9dc8
 Zend/zend_extensions.c | 8 ++++++++
af9dc8
 1 file changed, 8 insertions(+)
af9dc8
af9dc8
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
af9dc8
index 8321f1c..fbf1f32 100644
af9dc8
--- a/Zend/zend_extensions.c
af9dc8
+++ b/Zend/zend_extensions.c
af9dc8
@@ -105,6 +105,14 @@ int zend_load_extension(const char *path)
af9dc8
 #endif
af9dc8
 		DL_UNLOAD(handle);
af9dc8
 		return FAILURE;
af9dc8
+	} else if (zend_get_extension(new_extension->name)) {
af9dc8
+		fprintf(stderr, "Cannot load %s - extension already loaded\n", new_extension->name);
af9dc8
+/* See http://support.microsoft.com/kb/190351 */
af9dc8
+#ifdef PHP_WIN32
af9dc8
+		fflush(stderr);
af9dc8
+#endif
af9dc8
+		DL_UNLOAD(handle);
af9dc8
+		return FAILURE;
af9dc8
 	}
af9dc8
 
af9dc8
 	return zend_register_extension(new_extension, handle);
af9dc8
-- 
af9dc8
2.1.4
af9dc8