Merge remote-tracking branch 'origin/master'

2012-03-28 18:46:23 +02:00 · 2012-03-28 18:46:23 +02:00 · e986cc243e
commit e986cc243e
parent 1a893b1980 ed5fd8c852
2 changed files with 6 additions and 1 deletions
--- a/3
+++ b/3
@ -97,6 +97,9 @@ phpMyAdmin - ChangeLog
 - bug #3486970 [import] Exception on XML import
 - bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation

+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

--- a/show_config_errors.php
+++ b/show_config_errors.php
@ -16,6 +16,8 @@ error_reporting(E_ALL);
 /**
 * Read config file.
 */
-require CONFIG_FILE;
+if (is_readable(CONFIG_FILE)) {
+    require CONFIG_FILE;
+}

 ?>