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

fixed bug #444279 (# problem in uploaded file)

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-09-09 18:07:18 +00:00
parent 9554685c42
commit b621731873
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -15,6 +15,8 @@ $Source$
* tbl_create.php3: optimized a bit. * tbl_create.php3: optimized a bit.
* tbl_replace.php3: message associated to the query wasn't displayed if the * tbl_replace.php3: message associated to the query wasn't displayed if the
location header is used. location header is used.
* libraries/read_dump.lib.php3, function 'split_sql_file()': fixed bug
#444279 (# problem in uploaded file)... but find an other one :(
2001-09-09 Marc Delisle <lem9@users.sourceforge.net> 2001-09-09 Marc Delisle <lem9@users.sourceforge.net>
* lang/italian.inc.php3 updates thanks to Pietro Danesi. * lang/italian.inc.php3 updates thanks to Pietro Danesi.

17
libraries/read_dump.lib.php3
View File

@@ -31,18 +31,29 @@ if (!defined('__LIB_READ_DUMP__')){
$ret = array(); $ret = array();
$string_start = ''; $string_start = '';
$in_string = FALSE; $in_string = FALSE;
$in_comment = FALSE;
$escaped_backslash = FALSE; $escaped_backslash = FALSE;
for ($i = 0; $i < strlen($sql); ++$i) { for ($i = 0; $i < strlen($sql); ++$i) {
$char = $sql[$i]; $char = $sql[$i];
// if delimiter found, add the parsed part to the returned array // if delimiter found, add the parsed part to the returned array
if ($char == $delimiter && !$in_string) { if ($char == $delimiter && !$in_string && !$in_comment) {
$ret[] = substr($sql, 0, $i); $ret[] = substr($sql, 0, $i);
$sql = substr($sql, $i + 1); $sql = substr($sql, $i + 1);
$i = 0; $i = 0;
$last_char = ''; $last_char = '';
} }
// if in comment, add the parsed part to the returned array and
// remove the comment (till the first end of line)
else if ($in_comment) {
$ret[] = substr($sql, 0, $i);
$pos = strpos($sql, "\n");
$sql = substr($sql, $pos + 1);
$i = 0;
$last_char = '';
$in_comment = FALSE;
}
if ($in_string) { if ($in_string) {
// We are in a string, first check for escaped backslashes // We are in a string, first check for escaped backslashes
@@ -66,6 +77,10 @@ if (!defined('__LIB_READ_DUMP__')){
$in_string = TRUE; $in_string = TRUE;
$string_start = $char; $string_start = $char;
} }
// not start of a string, check for start of a "eol comment"
else if ($char == '#') {
$in_comment = TRUE;
}
} }
$last_char = $char; $last_char = $char;
} // end for } // end for