From d4cae0a62344b37908b1c157fa1cac27270ea0d0 Mon Sep 17 00:00:00 2001
From: Paulo Pinheiro <paulovictor.pinheiro@gmail.com>
Date: Mon, 30 Sep 2019 23:05:19 +0200
Subject: [PATCH] Fix issue #5542 (#5543)

Empty objects that inherit from Sized would try to access internal
ByteBuffer when Sized::size was called. So we add a single byte in
the empty buffer, so when size() is called it would return 0
---
 java/com/google/flatbuffers/FlexBuffers.java | 10 +++++-----
 tests/JavaTest.java                          | 12 ++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/java/com/google/flatbuffers/FlexBuffers.java b/java/com/google/flatbuffers/FlexBuffers.java
index 7f71e0508..1cd2227ee 100644
--- a/java/com/google/flatbuffers/FlexBuffers.java
+++ b/java/com/google/flatbuffers/FlexBuffers.java
@@ -98,7 +98,7 @@ public class FlexBuffers {
     /** Represent a vector of booleans type */
     public static final int FBT_VECTOR_BOOL = 36;  // To Allow the same type of conversion of type to vector type
 
-    private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(0).asReadOnlyBuffer();
+    private static final ByteBuffer EMPTY_BB = ByteBuffer.allocate(1).asReadOnlyBuffer();
 
     /**
      * Checks where a type is a typed vector
@@ -652,7 +652,7 @@ public class FlexBuffers {
      * have individual bytes accessed individually using {@link get(int)}</p>
      */
     public static class Blob extends Sized {
-        static final Blob EMPTY = new Blob(EMPTY_BB, 0, 1);
+        static final Blob EMPTY = new Blob(EMPTY_BB, 1, 1);
 
         Blob(ByteBuffer buff, int end, int byteWidth) {
             super(buff, end, byteWidth);
@@ -794,7 +794,7 @@ public class FlexBuffers {
      * Map object representing a set of key-value pairs.
      */
     public static class Map extends Vector {
-        private static final Map EMPTY_MAP = new Map(EMPTY_BB, 0, 0);
+        private static final Map EMPTY_MAP = new Map(EMPTY_BB, 1, 1);
 
         Map(ByteBuffer bb, int end, int byteWidth) {
             super(bb, end, byteWidth);
@@ -899,7 +899,7 @@ public class FlexBuffers {
      */
     public static class Vector extends Sized {
 
-        private static final Vector EMPTY_VECTOR = new Vector(ByteBuffer.allocate(0), 1, 1);
+        private static final Vector EMPTY_VECTOR = new Vector(EMPTY_BB, 1, 1);
 
         Vector(ByteBuffer bb, int end, int byteWidth) {
             super(bb, end, byteWidth);
@@ -960,7 +960,7 @@ public class FlexBuffers {
      */
     public static class TypedVector extends Vector {
 
-        private static final TypedVector EMPTY_VECTOR = new TypedVector(EMPTY_BB, 0, 1, FBT_INT);
+        private static final TypedVector EMPTY_VECTOR = new TypedVector(EMPTY_BB, 1, 1, FBT_INT);
 
         private final int elemType;
 
diff --git a/tests/JavaTest.java b/tests/JavaTest.java
index b24601b8a..79fee1ead 100644
--- a/tests/JavaTest.java
+++ b/tests/JavaTest.java
@@ -887,6 +887,17 @@ class JavaTest {
                 FlexBuffers.getRoot(b.getBuffer()).toString());
     }
 
+    public static void testFlexBuferEmpty() {
+        FlexBuffers.Blob blob = FlexBuffers.Blob.empty();
+        FlexBuffers.Map ary = FlexBuffers.Map.empty();
+        FlexBuffers.Vector map = FlexBuffers.Vector.empty();
+        FlexBuffers.TypedVector typedAry = FlexBuffers.TypedVector.empty();
+        TestEq(blob.size(), 0);
+        TestEq(map.size(), 0);
+        TestEq(ary.size(), 0);
+        TestEq(typedAry.size(), 0);
+    }
+
     public static void testHashMapToMap() {
         int entriesCount = 12;
 
@@ -941,6 +952,7 @@ class JavaTest {
         testSingleElementMap();
         testFlexBuffersTest();
         testHashMapToMap();
+        testFlexBuferEmpty();
     }
 
     static <T> void TestEq(T a, T b) {