Merge branch 'issue/BUG20462427' into develop

Geert Vanderkelen · Geert Vanderkelen · commit c956f3abf6cd · 2015-03-20T12:34:48.000+01:00
diff --git a/lib/mysql/connector/network.py b/lib/mysql/connector/network.py
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -221,11 +221,13 @@ def recv_plain(self):
         try:
             # Read the header of the MySQL packet, 4 bytes
             packet = bytearray(b'')
-            while len(packet) < 4:
-                chunk = self.sock.recv(4)
+            packet_len = 0
+            while packet_len < 4:
+                chunk = self.sock.recv(4 - packet_len)
                 if not chunk:
                     raise errors.InterfaceError(errno=2013)
                 packet += chunk
+                packet_len = len(packet)
 
             # Save the packet number and payload length
             self._packet_number = packet[3]
@@ -257,12 +259,13 @@ def recv_py26_plain(self):
         try:
             # Read the header of the MySQL packet, 4 bytes
             header = bytearray(b'')
-
-            while len(header) < 4:
-                chunk = self.sock.recv(4)
+            header_len = 0
+            while header_len < 4:
+                chunk = self.sock.recv(4 - header_len)
                 if not chunk:
                     raise errors.InterfaceError(errno=2013)
                 header += chunk
+                header_len = len(header)
 
             # Save the packet number and payload length
             self._packet_number = header[3]
diff --git a/lib/mysql/connector/protocol.py b/lib/mysql/connector/protocol.py
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -320,11 +320,8 @@ def read_text_result(self, sock, count=1):
                 while packet.startswith(b'\xff\xff\xff'):
                     datas.append(packet[4:])
                     packet = sock.recv()
-                if packet[4] == 254:
-                    eof = self.parse_eof(packet)
-                else:
-                    datas.append(packet[4:])
-                rowdata = utils.read_lc_string_list(b''.join(datas))
+                datas.append(packet[4:])
+                rowdata = utils.read_lc_string_list(bytearray(b'').join(datas))
             elif packet[4] == 254:
                 eof = self.parse_eof(packet)
                 rowdata = None
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -3240,7 +3240,6 @@ def tearDown(self):
         self.cnx.close()
 
 
-
 class BugOra19777815(tests.MySQLConnectorTests):
     """BUG#19777815:  CALLPROC() DOES NOT SUPPORT WARNINGS
     """
@@ -3289,7 +3288,11 @@ def test_warning_with_rows(self):
         cur.callproc(self.sp2)
 
         exp = [(1,)]
-        self.assertEqual(exp, cur.stored_results().next().fetchall())
+        if PY2:
+            self.assertEqual(exp, cur.stored_results().next().fetchall())
+        else:
+            self.assertEqual(exp, next(cur.stored_results()).fetchall())
+
         exp = [(u'Warning', 1642, u'TEST WARNING')]
         self.assertEqual(exp, cur.fetchwarnings())
 
@@ -3381,3 +3384,53 @@ def test_set(self):
 
         cur.execute("SELECT * FROM {0}".format(self.tbl))
         self.assertEqual(exp, cur.fetchall())
+
+
+class BugOra20462427(tests.MySQLConnectorTests):
+    """BUG#20462427: BYTEARRAY INDEX OUT OF RANGE
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        config['autocommit'] = True
+        config['connection_timeout'] = 100
+        self.cnx = connection.MySQLConnection(**config)
+        self.cur = self.cnx.cursor()
+
+        self.tbl = 'BugOra20462427'
+        self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+
+        create = ("CREATE TABLE {0} ("
+                  "id INT PRIMARY KEY, "
+                  "a LONGTEXT "
+                  ") ENGINE=Innodb DEFAULT CHARSET utf8".format(self.tbl))
+
+        self.cur.execute(create)
+
+    def tearDown(self):
+        self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+        self.cur.close()
+        self.cnx.close()
+
+    def test_bigdata(self):
+        temp = 'a'*16777210
+        insert = "INSERT INTO {0} (a) VALUES ('{1}')".format(self.tbl, temp)
+
+        self.cur.execute(insert)
+        self.cur.execute("SELECT a FROM {0}".format(self.tbl))
+        res = self.cur.fetchall()
+        self.assertEqual(16777210, len(res[0][0]))
+
+        self.cur.execute("UPDATE {0} SET a = concat(a, 'a')".format(self.tbl))
+        self.cur.execute("SELECT a FROM {0}".format(self.tbl))
+        res = self.cur.fetchall()
+        self.assertEqual(16777211, len(res[0][0]))
+
+        self.cur.execute("UPDATE {0} SET a = concat(a, 'a')".format(self.tbl))
+        self.cur.execute("SELECT a FROM {0}".format(self.tbl))
+        res = self.cur.fetchall()
+        self.assertEqual(16777212, len(res[0][0]))
+
+        self.cur.execute("UPDATE {0} SET a = concat(a, 'a')".format(self.tbl))
+        self.cur.execute("SELECT a FROM {0}".format(self.tbl))
+        res = self.cur.fetchall()
+        self.assertEqual(16777213, len(res[0][0]))
diff --git a/unittests.py b/unittests.py
@@ -120,6 +120,7 @@
 language = {lc_messages_dir}/english
 
 [mysqld]
+max_allowed_packet=26777216
 basedir = {basedir}
 datadir = {datadir}
 tmpdir = {tmpdir}
@@ -135,6 +136,7 @@
 log-bin = mysqld_{name}_bin
 local_infile = 1
 innodb_flush_log_at_trx_commit = 2
+innodb_log_file_size = 1Gb
 general_log_file = general_{name}.log
 ssl
 """
