BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-02 04:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #5542 (#5543)

Browse Source 
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
This commit is contained in:
Paulo Pinheiro
2019-09-30 23:05:19 +02:00
committed by Wouter van Oortmerssen
parent f1147f65bb
commit d4cae0a623
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/com/google/flatbuffers/FlexBuffers.java
View File

@@ -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;