Merge branch 'master' into feature/wireshark

thejtshow · thejtshow · commit 3235944b50dc · 2025-08-28T16:08:44.000-04:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -310,14 +310,17 @@ jobs:
 
   build-android:
    name: Build Android (on Linux)
+   if: false #disabled due to continual failure
    runs-on: ubuntu-24.04
    steps:
    - uses: actions/checkout@v3
    - name: set up Java
-     uses: actions/setup-java@v3
+     uses: actions/setup-java@v4
      with:
-       distribution: 'temurin'
-       java-version: '11'
+       distribution: temurin
+       java-version: 17
+   - name: set up Gradle
+     uses: gradle/actions/setup-gradle@v4
    - name: set up flatc
      run: |
        cmake -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF -DFLATBUFFERS_STRICT_MODE=ON .
@@ -398,11 +401,13 @@ jobs:
       # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode
     - name: Set up Xcode version
       run: sudo xcode-select -s /Applications/Xcode_14.3.app/Contents/Developer
-    - uses: gradle/wrapper-validation-action@v1.0.5
-    - uses: actions/setup-java@v3
+    - name: set up Java
+      uses: actions/setup-java@v4
       with:
-        distribution: 'temurin'
-        java-version: '11'
+        distribution: temurin
+        java-version: 17
+    - name: set up Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Build flatc
       run: |
        cmake -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF .
@@ -414,15 +419,18 @@ jobs:
 
   build-kotlin-linux:
     name: Build Kotlin Linux
+    if: false #disabled due to continual failure
     runs-on: ubuntu-24.04
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - name: set up Java
+      uses: actions/setup-java@v4
       with:
-        distribution: 'temurin'
-        java-version: '11'
-    - uses: gradle/wrapper-validation-action@v1.0.5
+        distribution: temurin
+        java-version: 17
+    - name: set up Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Build flatc
       run: |
        cmake -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF .
@@ -518,6 +526,8 @@ jobs:
       - uses: SwiftyLab/setup-swift@latest
         with:
           swift-version: '6.1'
+          # To be removed when swiftylab fixes the CI
+          visual-studio-components: Microsoft.VisualStudio.Component.Windows11SDK.22621
       - run: swift build
       - run: swift test
 
diff --git a/go/grpc.go b/go/grpc.go
@@ -1,7 +1,17 @@
 package flatbuffers
 
-// Codec implements gRPC-go Codec which is used to encode and decode messages.
-var Codec = "flatbuffers"
+import "errors"
+
+var (
+	// Codec implements gRPC-go Codec which is used to encode and decode messages.
+	Codec = "flatbuffers"
+
+	// ErrInsufficientData is returned when the data is too short to read the root UOffsetT.
+	ErrInsufficientData = errors.New("insufficient data")
+
+	// ErrInvalidRootOffset is returned when the root UOffsetT is out of bounds.
+	ErrInvalidRootOffset = errors.New("invalid root offset")
+)
 
 // FlatbuffersCodec defines the interface gRPC uses to encode and decode messages.  Note
 // that implementations of this interface must be thread safe; a Codec's
@@ -15,7 +25,21 @@ func (FlatbuffersCodec) Marshal(v interface{}) ([]byte, error) {
 
 // Unmarshal parses the wire format into v.
 func (FlatbuffersCodec) Unmarshal(data []byte, v interface{}) error {
-	v.(flatbuffersInit).Init(data, GetUOffsetT(data))
+	// Need at least 4 bytes to read the root table offset (UOffsetT).
+	// Vtable soffset_t and metadata are read later during field access.
+	if len(data) < SizeUOffsetT {
+		return ErrInsufficientData
+	}
+
+	off := GetUOffsetT(data)
+
+	// The root UOffsetT must be within the data buffer
+	// Compare in the unsigned domain to avoid signedness pitfalls
+	if off > UOffsetT(len(data)-SizeUOffsetT) {
+		return ErrInvalidRootOffset
+	}
+
+	v.(flatbuffersInit).Init(data, off)
 	return nil
 }
 
diff --git a/src/idl_gen_ts.cpp b/src/idl_gen_ts.cpp
@@ -1944,11 +1944,15 @@ class TsGenerator : public BaseGenerator {
 
     // Emit the fully qualified name
     if (parser_.opts.generate_name_strings) {
+      const std::string fullyQualifiedName = struct_def.defined_namespace->GetFullyQualifiedName(struct_def.name);
+
       GenDocComment(code_ptr);
-      code += "static getFullyQualifiedName():string {\n";
+      code += "static getFullyQualifiedName(): \"";
+      code += fullyQualifiedName;
+      code += "\" {\n";
       code +=
           "  return '" +
-          struct_def.defined_namespace->GetFullyQualifiedName(struct_def.name) +
+          fullyQualifiedName +
           "';\n";
       code += "}\n\n";
     }
diff --git a/tests/ts/my-game/example/ability.ts b/tests/ts/my-game/example/ability.ts
@@ -33,7 +33,7 @@ mutate_distance(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Ability" {
   return 'MyGame.Example.Ability';
 }
 
diff --git a/tests/ts/my-game/example/monster.ts b/tests/ts/my-game/example/monster.ts
@@ -813,7 +813,7 @@ mutate_double_inf_default(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Monster" {
   return 'MyGame.Example.Monster';
 }
 
diff --git a/tests/ts/my-game/example/referrable.ts b/tests/ts/my-game/example/referrable.ts
@@ -40,7 +40,7 @@ mutate_id(value:bigint):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Referrable" {
   return 'MyGame.Example.Referrable';
 }
 
diff --git a/tests/ts/my-game/example/stat.ts b/tests/ts/my-game/example/stat.ts
@@ -63,7 +63,7 @@ mutate_count(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Stat" {
   return 'MyGame.Example.Stat';
 }
 
diff --git a/tests/ts/my-game/example/struct-of-structs-of-structs.ts b/tests/ts/my-game/example/struct-of-structs-of-structs.ts
@@ -20,7 +20,7 @@ a(obj?:StructOfStructs):StructOfStructs|null {
   return (obj || new StructOfStructs()).__init(this.bb_pos, this.bb!);
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.StructOfStructsOfStructs" {
   return 'MyGame.Example.StructOfStructsOfStructs';
 }
 
diff --git a/tests/ts/my-game/example/struct-of-structs.ts b/tests/ts/my-game/example/struct-of-structs.ts
@@ -29,7 +29,7 @@ c(obj?:Ability):Ability|null {
   return (obj || new Ability()).__init(this.bb_pos + 12, this.bb!);
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.StructOfStructs" {
   return 'MyGame.Example.StructOfStructs';
 }
 
diff --git a/tests/ts/my-game/example/test-simple-table-with-enum.ts b/tests/ts/my-game/example/test-simple-table-with-enum.ts
@@ -41,7 +41,7 @@ mutate_color(value:Color):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.TestSimpleTableWithEnum" {
   return 'MyGame.Example.TestSimpleTableWithEnum';
 }
 
diff --git a/tests/ts/my-game/example/test.ts b/tests/ts/my-game/example/test.ts
@@ -33,7 +33,7 @@ mutate_b(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Test" {
   return 'MyGame.Example.Test';
 }
 
diff --git a/tests/ts/my-game/example/type-aliases.ts b/tests/ts/my-game/example/type-aliases.ts
@@ -214,7 +214,7 @@ vf64Array():Float64Array|null {
   return offset ? new Float64Array(this.bb!.bytes().buffer, this.bb!.bytes().byteOffset + this.bb!.__vector(this.bb_pos + offset), this.bb!.__vector_len(this.bb_pos + offset)) : null;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.TypeAliases" {
   return 'MyGame.Example.TypeAliases';
 }
 
diff --git a/tests/ts/my-game/example/vec3.ts b/tests/ts/my-game/example/vec3.ts
@@ -66,7 +66,7 @@ test3(obj?:Test):Test|null {
   return (obj || new Test()).__init(this.bb_pos + 26, this.bb!);
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Vec3" {
   return 'MyGame.Example.Vec3';
 }
 
diff --git a/tests/ts/my-game/example2/monster.ts b/tests/ts/my-game/example2/monster.ts
@@ -24,7 +24,7 @@ static getSizePrefixedRootAsMonster(bb:flatbuffers.ByteBuffer, obj?:Monster):Mon
   return (obj || new Monster()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example2.Monster" {
   return 'MyGame.Example2.Monster';
 }
 
diff --git a/tests/ts/my-game/in-parent-namespace.ts b/tests/ts/my-game/in-parent-namespace.ts
@@ -24,7 +24,7 @@ static getSizePrefixedRootAsInParentNamespace(bb:flatbuffers.ByteBuffer, obj?:In
   return (obj || new InParentNamespace()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.InParentNamespace" {
   return 'MyGame.InParentNamespace';
 }
 
diff --git a/tests/ts/optional-scalars/scalar-stuff.ts b/tests/ts/optional-scalars/scalar-stuff.ts
@@ -209,7 +209,7 @@ defaultEnum():OptionalByte {
   return offset ? this.bb!.readInt8(this.bb_pos + offset) : OptionalByte.One;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "optional_scalars.ScalarStuff" {
   return 'optional_scalars.ScalarStuff';
 }
 
diff --git a/tests/ts/union_vector/attacker.ts b/tests/ts/union_vector/attacker.ts
@@ -40,7 +40,7 @@ mutate_sword_attack_damage(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "Attacker" {
   return 'Attacker';
 }
 
diff --git a/tests/ts/union_vector/book-reader.ts b/tests/ts/union_vector/book-reader.ts
@@ -24,7 +24,7 @@ mutate_books_read(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "BookReader" {
   return 'BookReader';
 }
 
diff --git a/tests/ts/union_vector/falling-tub.ts b/tests/ts/union_vector/falling-tub.ts
@@ -24,7 +24,7 @@ mutate_weight(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "FallingTub" {
   return 'FallingTub';
 }
 
diff --git a/tests/ts/union_vector/hand-fan.ts b/tests/ts/union_vector/hand-fan.ts
@@ -40,7 +40,7 @@ mutate_length(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "HandFan" {
   return 'HandFan';
 }
 
diff --git a/tests/ts/union_vector/movie.ts b/tests/ts/union_vector/movie.ts
@@ -67,7 +67,7 @@ charactersLength():number {
   return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "Movie" {
   return 'Movie';
 }
 
diff --git a/tests/ts/union_vector/rapunzel.ts b/tests/ts/union_vector/rapunzel.ts
@@ -24,7 +24,7 @@ mutate_hair_length(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "Rapunzel" {
   return 'Rapunzel';
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ mutate_distance(value:number):boolean {`
`33`	`33`	`return true;`
`34`	`34`	`}`
`35`	`35`
`36`		`-static getFullyQualifiedName():string {`
	`36`	`+static getFullyQualifiedName(): "MyGame.Example.Ability" {`
`37`	`37`	`return 'MyGame.Example.Ability';`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ mutate_double_inf_default(value:number):boolean {`
`813`	`813`	`return true;`
`814`	`814`	`}`
`815`	`815`
`816`		`-static getFullyQualifiedName():string {`
	`816`	`+static getFullyQualifiedName(): "MyGame.Example.Monster" {`
`817`	`817`	`return 'MyGame.Example.Monster';`
`818`	`818`	`}`
`819`	`819`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ mutate_id(value:bigint):boolean {`
`40`	`40`	`return true;`
`41`	`41`	`}`
`42`	`42`
`43`		`-static getFullyQualifiedName():string {`
	`43`	`+static getFullyQualifiedName(): "MyGame.Example.Referrable" {`
`44`	`44`	`return 'MyGame.Example.Referrable';`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ mutate_count(value:number):boolean {`
`63`	`63`	`return true;`
`64`	`64`	`}`
`65`	`65`
`66`		`-static getFullyQualifiedName():string {`
	`66`	`+static getFullyQualifiedName(): "MyGame.Example.Stat" {`
`67`	`67`	`return 'MyGame.Example.Stat';`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ a(obj?:StructOfStructs):StructOfStructs\|null {`
`20`	`20`	`return (obj \|\| new StructOfStructs()).__init(this.bb_pos, this.bb!);`
`21`	`21`	`}`
`22`	`22`
`23`		`-static getFullyQualifiedName():string {`
	`23`	`+static getFullyQualifiedName(): "MyGame.Example.StructOfStructsOfStructs" {`
`24`	`24`	`return 'MyGame.Example.StructOfStructsOfStructs';`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ c(obj?:Ability):Ability\|null {`
`29`	`29`	`return (obj \|\| new Ability()).__init(this.bb_pos + 12, this.bb!);`
`30`	`30`	`}`
`31`	`31`
`32`		`-static getFullyQualifiedName():string {`
	`32`	`+static getFullyQualifiedName(): "MyGame.Example.StructOfStructs" {`
`33`	`33`	`return 'MyGame.Example.StructOfStructs';`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ mutate_color(value:Color):boolean {`
`41`	`41`	`return true;`
`42`	`42`	`}`
`43`	`43`
`44`		`-static getFullyQualifiedName():string {`
	`44`	`+static getFullyQualifiedName(): "MyGame.Example.TestSimpleTableWithEnum" {`
`45`	`45`	`return 'MyGame.Example.TestSimpleTableWithEnum';`
`46`	`46`	`}`
`47`	`47`