Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--show_config_errors.php4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 40614885dd..d7b3789202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
phpMyAdmin - ChangeLog
======================
+3.4.10.2 (2012-03-28)
+- [security] Fixed local path disclosure vulnerability, see PMASA-2012-2
+
3.4.10.1 (2012-02-18)
- [security] XSS in replication setup, see PMASA-2012-1
diff --git a/show_config_errors.php b/show_config_errors.php
index 9024fec22d..7299a44249 100644
--- a/show_config_errors.php
+++ b/show_config_errors.php
@@ -14,6 +14,8 @@ error_reporting(E_ALL);
/**
* Read config file.
*/
-require CONFIG_FILE;
+if (is_readable(CONFIG_FILE)) {
+ require CONFIG_FILE;
+}
?>