From 07673dcee95f29727bc157c9355d2aa2ae4f7fd6 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 12 Apr 2009 10:43:43 +0000
Subject: [PATCH] bug #2634827 [import] Using DELIMITER ends with infinite
 cycle

---
 ChangeLog                | 1 +
 libraries/import/sql.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 71618be65..1b3c06e4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2724844 Add Fields: Add index is missing quotes
   thanks to Luke Armstrong
 - 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)
 - [security] HTTP Response Splitting and file inclusion vulnerabilities 
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index 596d47ce5..0dc2a8f6a 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -109,6 +109,11 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) {
     // Current length of our 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
     while ($i < $len) {
         $found_delimiter = false;