Fixed deserialization of variable-length data types (JSON) (#129)

shyiko · Nov 20, 2016 · 1612ebe · 1612ebe
1 parent 24f4cae
commit 1612ebe
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/com/github/shyiko/mysql/binlog/event/deserialization/json/JsonBinary.java b/src/main/java/com/github/shyiko/mysql/binlog/event/deserialization/json/JsonBinary.java
@@ -934,13 +934,15 @@ protected BigInteger readUInt64() throws IOException {
      * @return the integer value
      */
     protected int readVariableInt() throws IOException {
-        byte b = 0;
         int length = 0;
-        do {
-            b = (byte) reader.read();
-            length = (length << 7) + (b & 0x7F);
-        } while (b < 0);
-        return length;
+        for (int i = 0; i < 5; i++) {
+            byte b = (byte) reader.read();
+            length |= (b & 0x7F) << (7 * i);
+            if ((b & 0x80) == 0) {
+                return length;
+            }
+        }
+        throw new IOException("Unexpected byte sequence (" + length + ")");
     }
 
     protected Boolean readLiteral() throws IOException {