gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weblate 2013-07-20 16:27:30 +02:00
commit 71c26bcec2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
- bug Incorrect Drizzle 7 detection
- bug #4019 Create database if not exists (export): add an option to the
interface to enable generating CREATE DATABASE and USE (false by default)
- bug #4012 Crash on CSV file import
4.0.4.1 (2013-06-30)
- [security] Global variables scope injection vulnerability (see PMASA-2013-7)

12
libraries/import.lib.php
View File

@ -531,13 +531,13 @@ function PMA_getD($last_cumulative_size)
/**
* Obtains the decimal size of a given cell
*
* @param string &$cell cell content
* @param string $cell cell content
*
* @return array Contains the precision, scale, and full size
* representation of the given decimal cell
* @access public
*/
function PMA_getDecimalSize(&$cell)
function PMA_getDecimalSize($cell)
{
$curr_size = strlen((string)$cell);
$decPos = strpos($cell, ".");
@ -557,7 +557,7 @@ function PMA_getDecimalSize(&$cell)
* (NONE or VARCHAR or DECIMAL or INT or BIGINT)
* @param int $curr_type Type of the current cell
* (NONE or VARCHAR or DECIMAL or INT or BIGINT)
* @param string &$cell The current cell
* @param string $cell The current cell
*
* @return string Size of the given cell in the type-appropriate format
* @access public
@ -565,7 +565,7 @@ function PMA_getDecimalSize(&$cell)
* @todo Handle the error cases more elegantly
*/
function PMA_detectSize($last_cumulative_size, $last_cumulative_type,
$curr_type, &$cell
$curr_type, $cell
) {
$curr_size = strlen((string)$cell);
@ -756,14 +756,14 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type,
*
* @param int $last_cumulative_type Last cumulative column type
* (VARCHAR or INT or BIGINT or DECIMAL or NONE)
* @param string &$cell String representation of the cell for which
* @param string $cell String representation of the cell for which
* a best-fit type is to be determined
*
* @return int The MySQL type representation
* (VARCHAR or INT or BIGINT or DECIMAL or NONE)
* @access public
*/
function PMA_detectType($last_cumulative_type, &$cell)
function PMA_detectType($last_cumulative_type, $cell)
{
/**
* If numeric, determine if decimal, int or bigint