Skip to content

Commit

Permalink
Proper initialization of $_message variable according to value of $re…
Browse files Browse the repository at this point in the history
…sult

While calling getDisplay, $_message should be an instance of PMA\libraries\Message.

Fix #12650

Also, spaces at the beginning of a table name are allowed if used inside backquotes.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
  • Loading branch information
devenbansod committed Oct 19, 2016
1 parent 9de117f commit 1eac9c5
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
18 changes: 13 additions & 5 deletions libraries/Table.php
Expand Up @@ -1245,17 +1245,22 @@ static public function moveCopy($source_db, $source_table, $target_db,
* checks if given name is a valid table name,
* currently if not empty, trailing spaces, '.', '/' and '\'
*
* @param string $table_name name to check
* @param string $table_name name to check
* @param boolean $is_backquoted whether this name is used inside backquotes or not
*
* @todo add check for valid chars in filename on current system/os
* @see https://dev.mysql.com/doc/refman/5.0/en/legal-names.html
*
* @return boolean whether the string is valid or not
*/
static function isValidName($table_name)
static function isValidName($table_name, $is_backquoted = false)
{
if ($table_name !== trim($table_name)) {
// trailing spaces
if ($table_name !== rtrim($table_name)) {
// trailing spaces not allowed even in backquotes
return false;
}
if (! $is_backquoted && $table_name !== trim($table_name)) {
// spaces at the start or in between
return false;
}

Expand Down Expand Up @@ -1310,7 +1315,10 @@ function () {
return true;
}

if (! Table::isValidName($new_name)) {
// Allow whitespaces (not trailing) in $new_name,
// since we are using $backquoted in getting the fullName of table
// below to be used in the query
if (! Table::isValidName($new_name, true)) {
$this->errors[] = __('Invalid table name:') . ' '
. $new_table->getFullName();
return false;
Expand Down
5 changes: 5 additions & 0 deletions tbl_operations.php
Expand Up @@ -226,7 +226,12 @@
}
exit;
}
} else {
$_message = $result
? PMA\libraries\Message::success($_message)
: PMA\libraries\Message::error($_message);
}

if (! empty($warning_messages)) {
$_message = new PMA\libraries\Message;
$_message->addMessages($warning_messages);
Expand Down

0 comments on commit 1eac9c5

Please sign in to comment.