From: Casper <casperneo@uchicago.edu>
Date: Tue, 24 Aug 2021 13:41:39 +0000 (-0400)
Subject: fix parser string=null (#6810)
X-Git-Tag: accepted/tizen/unified/20221226.065959~160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b9123baffc7c83d5d39f311d72d8cfcdf80e7e1;p=platform%2Fupstream%2Fflatbuffers.git

fix parser string=null (#6810)

Co-authored-by: Casper Neo <cneo@google.com>
---

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 720e803..a6fad12 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -812,8 +812,7 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
           "or in structs.");
     if (IsString(type) || IsVector(type)) {
       advanced_features_ |= reflection::DefaultVectorsAndStrings;
-      if (field->value.constant != "0" && field->value.constant != "null" &&
-          !SupportsDefaultVectorsAndStrings()) {
+      if (field->value.constant != "0" && !SupportsDefaultVectorsAndStrings()) {
         return Error(
             "Default values for strings and vectors are not supported in one "
             "of the specified programming languages");
diff --git a/tests/test.cpp b/tests/test.cpp
index 7ae8a2b..866ba38 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -3883,6 +3883,7 @@ void StringVectorDefaultsTest() {
   schemas.push_back("table Monster { mana: string = \"\"; }");
   schemas.push_back("table Monster { mana: string = \"mystr\"; }");
   schemas.push_back("table Monster { mana: string = \"  \"; }");
+  schemas.push_back("table Monster { mana: string = \"null\"; }");
   schemas.push_back("table Monster { mana: [int] = []; }");
   schemas.push_back("table Monster { mana: [uint] = [  ]; }");
   schemas.push_back("table Monster { mana: [byte] = [\t\t\n]; }");