Fixes issue with certain blob data columns

Fixed an issue where if a blob column had an empty string, the query packet response processor would misinterpret a byte equalling 0x00 as a MySQL EOF packet and therefore corrupting and not retrieving all rows within the table.
BoardiesITSolutions · Jun 12, 2020 · 0f0416f · 0f0416f
1 parent 4ea4b2b
commit 0f0416f
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 11 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/AndroidMySQLConnector/build.gradle b/AndroidMySQLConnector/build.gradle
@@ -20,7 +20,7 @@ else
 }
 
 archivesBaseName="AndroidMySQLConnector"
-version '0.39'
+version '0.40'
 group 'com.BoardiesITSolutions'
 
 
@@ -30,8 +30,8 @@ android {
         //applicationId "com.BoardiesITSolutions.AndroidMySQLConnector"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 27
-        versionName "0.37"
+        versionCode 28
+        versionName "0.40"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/...nnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/ColumnDefinition.java b/...nnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/ColumnDefinition.java
@@ -1,5 +1,9 @@
 package com.BoardiesITSolutions.AndroidMySQLConnector;
 
+import java.math.BigInteger;
+
+import static java.lang.Math.abs;
+
 public class ColumnDefinition
 {
     public enum ColumnType {

diff --git a/...dMySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/MySQLRow.java b/...dMySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/MySQLRow.java
@@ -15,6 +15,11 @@ public MySQLRow()
         this.columnAndRowValue = new HashMap<>();
     }
 
+    public int getSizeOfHash()
+    {
+        return this.columnAndRowValue.size();
+    }
+
     public void addRowValue(ColumnDefinition columnDefinition, String rowValue)
     {
         this.columnAndRowValue.put(columnDefinition, rowValue);

diff --git a/...n/java/com/BoardiesITSolutions/AndroidMySQLConnector/PacketManager/COM_QueryResponse.java b/...n/java/com/BoardiesITSolutions/AndroidMySQLConnector/PacketManager/COM_QueryResponse.java
@@ -73,7 +73,7 @@ private void processPacketData()
 
             int columnLength = this.mysqlConn.getMysqlIO().fromByteArray((byte[])this.mysqlConn.getMysqlIO().extractData(4));
 
-            int columnType = (byte)this.mysqlConn.getMysqlIO().extractData(1);
+            int columnType = (byte)this.mysqlConn.getMysqlIO().extractData(1) & 0xff;
 
             int flags = this.mysqlConn.getMysqlIO().fromByteArray((byte[])this.mysqlConn.getMysqlIO().extractData(2));
 
@@ -155,7 +155,7 @@ private void processPacketData()
             for (; currentColumn < numberOfFields; currentColumn++)
             {
                 packetType = this.mysqlConn.getMysqlIO().readCurrentByteWithoutShift() & 0xff;
-                if (Helpers.getMySQLPacketTypeFromIntWithoutShift(packetType) == Helpers.MYSQL_PACKET_TYPE.MYSQL_OK_PACKET ||
+                if ((numberOfFields == currentColumn-1) &&  Helpers.getMySQLPacketTypeFromIntWithoutShift(packetType) == Helpers.MYSQL_PACKET_TYPE.MYSQL_OK_PACKET ||
                         Helpers.getMySQLPacketTypeFromIntWithoutShift(packetType) == Helpers.MYSQL_PACKET_TYPE.MYSQL_EOF_PACKET)
                 {
 
@@ -164,10 +164,14 @@ private void processPacketData()
                         //We've got an EOF packet and the remaining data in the socket data is less than 9 so this is a true 0xFE.
                         //You sometimes get an 0xFE packet when its actually a len encoded integer. As this is a true EOF packet
                         //we can break from the loop as we have everything we need
-                        finishedProcessingColumns = true;
+
                         //We've created a row object in case we needed it, but as we've detected as an EOF packet,
                         //set the row to null so it doesn't get added to to the resultset.
-                        row = null;
+                        if (row.getSizeOfHash() == 0)
+                        {
+                            row = null;
+                            finishedProcessingColumns = true;
+                        }
                         break;
                     }
                     //We've got an EOF packet but there's actually more data so not a true EOF packet so shift 9 bytes
@@ -181,8 +185,11 @@ private void processPacketData()
                     {
                         if ((this.mysqlConn.getMysqlIO().getSocketDataLength() - this.mysqlConn.getMysqlIO().getCurrentBytesRead()) < 9)
                         {
-                            finishedProcessingColumns = true;
-                            row = null;
+                            if (row.getSizeOfHash() == 0)
+                            {
+                                row = null;
+                                finishedProcessingColumns = true;
+                            }
                             break;
                         }
                     }

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@
 buildscript {
 
     ext {
-        publishToMavenLocal = false
+        publishToMavenLocal = true
     }
 
     repositories {