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

bug #2634827 [import] Using DELIMITER ends with infinite cycle

Browse Source
This commit is contained in:
Marc Delisle
2009-04-12 10:43:43 +00:00
parent 2ad18b06e3
commit 07673dcee9
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -73,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2724844 Add Fields: Add index is missing quotes - bug #2724844 Add Fields: Add index is missing quotes
thanks to Luke Armstrong thanks to Luke Armstrong
- bug #2740550 [interface] Using textarea CharEditing drops default values - bug #2740550 [interface] Using textarea CharEditing drops default values
- bug #2634827 [import] Using DELIMITER ends with infinite cycle
3.1.3.1 (2009-03-24) 3.1.3.1 (2009-03-24)
- [security] HTTP Response Splitting and file inclusion vulnerabilities - [security] HTTP Response Splitting and file inclusion vulnerabilities

5
libraries/import/sql.php
View File

@@ -109,6 +109,11 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) {
// Current length of our buffer // Current length of our buffer
$len = strlen($buffer); $len = strlen($buffer);
// Avoid endless loop in case of missing last newline
if ($GLOBALS['finished'] && $buffer[$len - 1] != "\n") {
$buffer .= "\n";
}
// Grab some SQL queries out of it // Grab some SQL queries out of it
while ($i < $len) { while ($i < $len) {
$found_delimiter = false; $found_delimiter = false;