From 8f4b73071bdf08bca33f362f26fec60cd06dcddb Mon Sep 17 00:00:00 2001 From: Justin Davis Date: Sun, 21 Dec 2025 20:45:17 -0500 Subject: [PATCH] Revert "fix using null string in vector (#7872)" This reverts commit 1cb1c4baeeedfe3bc90d8c4110c889dd17af5ca7. --- net/FlatBuffers/FlatBufferBuilder.cs | 3 +-- net/FlatBuffers/Table.cs | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/net/FlatBuffers/FlatBufferBuilder.cs b/net/FlatBuffers/FlatBufferBuilder.cs index 3932f4bc318..af0e896eb9b 100644 --- a/net/FlatBuffers/FlatBufferBuilder.cs +++ b/net/FlatBuffers/FlatBufferBuilder.cs @@ -438,8 +438,7 @@ public void AddOffset(int off) if (off > Offset) throw new ArgumentException(); - if (off != 0) - off = Offset - off + sizeof(int); + off = Offset - off + sizeof(int); PutInt(off); } diff --git a/net/FlatBuffers/Table.cs b/net/FlatBuffers/Table.cs index d6d9d09fb4c..348d4c97d9b 100644 --- a/net/FlatBuffers/Table.cs +++ b/net/FlatBuffers/Table.cs @@ -65,11 +65,7 @@ public static int __indirect(int offset, ByteBuffer bb) // Create a .NET String from UTF-8 data stored inside the flatbuffer. public string __string(int offset) { - int stringOffset = bb.GetInt(offset); - if (stringOffset == 0) - return null; - - offset += stringOffset; + offset += bb.GetInt(offset); var len = bb.GetInt(offset); var startPos = offset + sizeof(int); return bb.GetStringUTF8(startPos, len);