Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

ChangeLog

@@ -13,6 +13,8 @@ phpMyAdmin - ChangeLog
 - bug #4483 'New window' link (selflink) disappears, causing Javascript error
 - bug #4489 Incorrect detection of privileges for routine creation
 - bug #4459 First few characters of database name aren't clickable when expanded
+- bug #4486 [security] XSS injection due to unescaped table comment
+- bug #4488 [security] XSS injection due to unescaped table name (triggers)
 
 4.2.5.0 (2014-06-26)
 - bug #4467 shell_exec() has been disabled for security reasons

libraries/rte/rte_list.lib.php

@@ -253,9 +253,9 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
     $retval .= "            </td>\n";
     if (empty($table)) {
         $retval .= "            <td>\n";
-        $retval .= "                <a href='db_triggers.php?{$url_query}"
-                                     . "&amp;table={$trigger['table']}'>"
-                                     . $trigger['table'] . "</a>\n";
+        $retval .= "<a href='db_triggers.php?{$url_query}"
+            . "&amp;table=" . urlencode($trigger['table']) . "'>"
+            . urlencode($trigger['table']) . "</a>";
         $retval .= "            </td>\n";
     }
     $retval .= "            <td>\n";

libraries/structure.lib.php

@@ -53,7 +53,8 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
     $search_table .= '</a>';
 
     $browse_table_label = '<a href="sql.php?' . $tbl_url_query
-        . '&amp;pos=0" title="' . $current_table['TABLE_COMMENT'] . '">'
+        . '&amp;pos=0" title="'
+        . htmlspecialchars($current_table['TABLE_COMMENT']) . '">'
         . $truename . '</a>';
 
     if (!$db_is_system_schema) {