From e4c5401e6cb46608e4189bad7db2b3970fd09e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 2 Mar 2017 09:19:37 +0100
Subject: [PATCH] Properly escape MIME transformatoin names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #13045

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                                          | 1 +
 templates/columns_definitions/transformation.phtml | 2 +-
 transformation_overview.php                        | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6de1b950aa..9024a49523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,7 @@ phpMyAdmin - ChangeLog
 - issue #13040 Compatibility with hhvm 3.18
 - issue #13031 Fixed displaying of all rows
 - issue #12967 Fixed related field selection for native relations
+- issue #13045 Properly escape MIME transformatoin names
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/templates/columns_definitions/transformation.phtml b/templates/columns_definitions/transformation.phtml
index 96467007ad..99bab34053 100644
--- a/templates/columns_definitions/transformation.phtml
+++ b/templates/columns_definitions/transformation.phtml
@@ -17,7 +17,7 @@
                     $available_mime[$type . '_file'][$mimekey]
                 ) . ' (' . strtolower($parts[0]) . ":" . $parts[1] . ')';
             ?>
-            <option value="<?= $available_mime[$type . '_file'][$mimekey]; ?>"
+            <option value="<?= htmlspecialchars($available_mime[$type . '_file'][$mimekey]); ?>"
                     <?= $checked; ?>
                     title="<?= htmlspecialchars($tooltip); ?>">
                 <?= htmlspecialchars($name); ?>
diff --git a/transformation_overview.php b/transformation_overview.php
index 8d89572d9e..32da1979aa 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -25,9 +25,9 @@ $types = PMA_getAvailableMIMEtypes();
 foreach ($types['mimetype'] as $key => $mimetype) {
 
     if (isset($types['empty_mimetype'][$mimetype])) {
-        echo '<i>' , $mimetype , '</i><br />';
+        echo '<i>' , htmlspecialchars($mimetype) , '</i><br />';
     } else {
-        echo $mimetype , '<br />';
+        echo htmlspecialchars($mimetype) , '<br />';
     }
 
 }
@@ -60,8 +60,8 @@ $th = array(
         $desc = PMA_getTransformationDescription($types[$ttype . '_file'][$key]);
         ?>
         <tr>
-            <td><?php echo $transform; ?></td>
-            <td><?php echo $desc; ?></td>
+            <td><?php echo htmlspecialchars($transform); ?></td>
+            <td><?php echo htmlspecialchars($desc); ?></td>
         </tr>
         <?php
     }