From 480815447af30b52b36a7a81c37a41d0d30aac54 Mon Sep 17 00:00:00 2001
From: Derek Bailey <dbaileychess@gmail.com>
Date: Mon, 28 Oct 2019 09:43:33 -0700
Subject: [PATCH] C++ verifier for evolved union fields should return true
 (#5586)

---
 samples/monster_generated.h                 | 2 +-
 src/idl_gen_cpp.cpp                         | 2 +-
 tests/monster_test_generated.h              | 6 +++---
 tests/union_vector/union_vector_generated.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index 50ce9c0..ec2c24c 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -655,7 +655,7 @@ inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *obj, Eq
       auto ptr = reinterpret_cast<const MyGame::Sample::Weapon *>(obj);
       return verifier.VerifyTable(ptr);
     }
-    default: return false;
+    default: return true;
   }
 }
 
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 505fdaa..826f646 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -1295,7 +1295,7 @@ class CppGenerator : public BaseGenerator {
         code_ += "    }";
       }
     }
-    code_ += "    default: return false;";
+    code_ += "    default: return true;"; // unknown values are OK.
     code_ += "  }";
     code_ += "}";
     code_ += "";
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index d1b5c38..c802a68 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -2801,7 +2801,7 @@ inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *obj, Any type
       auto ptr = reinterpret_cast<const MyGame::Example2::Monster *>(obj);
       return verifier.VerifyTable(ptr);
     }
-    default: return false;
+    default: return true;
   }
 }
 
@@ -2912,7 +2912,7 @@ inline bool VerifyAnyUniqueAliases(flatbuffers::Verifier &verifier, const void *
       auto ptr = reinterpret_cast<const MyGame::Example2::Monster *>(obj);
       return verifier.VerifyTable(ptr);
     }
-    default: return false;
+    default: return true;
   }
 }
 
@@ -3023,7 +3023,7 @@ inline bool VerifyAnyAmbiguousAliases(flatbuffers::Verifier &verifier, const voi
       auto ptr = reinterpret_cast<const MyGame::Example::Monster *>(obj);
       return verifier.VerifyTable(ptr);
     }
-    default: return false;
+    default: return true;
   }
 }
 
diff --git a/tests/union_vector/union_vector_generated.h b/tests/union_vector/union_vector_generated.h
index ad32194..fcb1d8c 100644
--- a/tests/union_vector/union_vector_generated.h
+++ b/tests/union_vector/union_vector_generated.h
@@ -563,7 +563,7 @@ inline bool VerifyCharacter(flatbuffers::Verifier &verifier, const void *obj, Ch
       auto ptr = reinterpret_cast<const flatbuffers::String *>(obj);
       return verifier.VerifyString(ptr);
     }
-    default: return false;
+    default: return true;
   }
 }
 
-- 
2.7.4