Merge branch 'QA_4_6' into QA_4_6-security

phpmyadmin · Jul 22, 2016 · 28eb84e · 28eb84e
2 parents fd324e5 + 9990310
commit 28eb84e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.6.4 (not yet released)
 - issue        Include X-Robots-Tag header in responses
+- issue        Enfornce numeric field length when creating table
 
 4.6.3 (2016-06-23)
 - issue #12249 Fixed cookie path on Windows

diff --git a/libraries/Table.php b/libraries/Table.php
@@ -400,7 +400,7 @@ static function generateFieldSpec($name, $type, $length = '',
         $pattern = '@^(DATE|TINYBLOB|TINYTEXT|BLOB|TEXT|'
             . 'MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|SERIAL|BOOLEAN|UUID)$@i';
         if ($length != '' && ! preg_match($pattern, $type)) {
-            $query .= '(' . $length . ')';
+            $query .= '(' . intval($length) . ')';
         }
 
         if ($virtuality) {