fix possible null dereference for nested_root accessor

dbaileychess · dbaileychess · commit 75143f836b7f · 2023-05-03T00:14:27.000-07:00
diff --git a/tests/cpp17/generated_cpp17/monster_test_generated.h b/tests/cpp17/generated_cpp17/monster_test_generated.h
@@ -1500,7 +1500,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTNESTEDFLATBUFFER);
   }
   const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const {
-    return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data());
+    const auto _f = testnestedflatbuffer();
+    return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())
+              : nullptr;
   }
   const MyGame::Example::Stat *testempty() const {
     return GetPointer<const MyGame::Example::Stat *>(VT_TESTEMPTY);
@@ -1605,7 +1607,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_FLEX);
   }
   flexbuffers::Reference flex_flexbuffer_root() const {
-    return flexbuffers::GetRoot(flex()->Data(), flex()->size());
+    const auto _f = flex();
+    return _f ? flexbuffers::GetRoot(_f->Data(), _f->size())
+              : flexbuffers::Reference();
   }
   const ::flatbuffers::Vector<const MyGame::Example::Test *> *test5() const {
     return GetPointer<const ::flatbuffers::Vector<const MyGame::Example::Test *> *>(VT_TEST5);
@@ -1735,7 +1739,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTREQUIREDNESTEDFLATBUFFER);
   }
   const MyGame::Example::Monster *testrequirednestedflatbuffer_nested_root() const {
-    return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testrequirednestedflatbuffer()->Data());
+    const auto _f = testrequirednestedflatbuffer();
+    return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())
+              : nullptr;
   }
   const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *scalar_key_sorted_tables() const {
     return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *>(VT_SCALAR_KEY_SORTED_TABLES);
diff --git a/tests/monster_test_suffix/ext_only/monster_test_generated.hpp b/tests/monster_test_suffix/ext_only/monster_test_generated.hpp
@@ -1487,7 +1487,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTNESTEDFLATBUFFER);
   }
   const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const {
-    return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data());
+    const auto _f = testnestedflatbuffer();
+    return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())
+              : nullptr;
   }
   const MyGame::Example::Stat *testempty() const {
     return GetPointer<const MyGame::Example::Stat *>(VT_TESTEMPTY);
@@ -1592,7 +1594,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_FLEX);
   }
   flexbuffers::Reference flex_flexbuffer_root() const {
-    return flexbuffers::GetRoot(flex()->Data(), flex()->size());
+    const auto _f = flex();
+    return _f ? flexbuffers::GetRoot(_f->Data(), _f->size())
+              : flexbuffers::Reference();
   }
   const ::flatbuffers::Vector<const MyGame::Example::Test *> *test5() const {
     return GetPointer<const ::flatbuffers::Vector<const MyGame::Example::Test *> *>(VT_TEST5);
@@ -1722,7 +1726,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTREQUIREDNESTEDFLATBUFFER);
   }
   const MyGame::Example::Monster *testrequirednestedflatbuffer_nested_root() const {
-    return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testrequirednestedflatbuffer()->Data());
+    const auto _f = testrequirednestedflatbuffer();
+    return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())
+              : nullptr;
   }
   const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *scalar_key_sorted_tables() const {
     return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *>(VT_SCALAR_KEY_SORTED_TABLES);
diff --git a/tests/monster_test_suffix/filesuffix_only/monster_test_suffix.h b/tests/monster_test_suffix/filesuffix_only/monster_test_suffix.h
@@ -1487,7 +1487,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTNESTEDFLATBUFFER);
   }
   const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const {
-    return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data());
+    const auto _f = testnestedflatbuffer();
+    return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())
+              : nullptr;
   }
   const MyGame::Example::Stat *testempty() const {
     return GetPointer<const MyGame::Example::Stat *>(VT_TESTEMPTY);
@@ -1592,7 +1594,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_FLEX);
   }
   flexbuffers::Reference flex_flexbuffer_root() const {
-    return flexbuffers::GetRoot(flex()->Data(), flex()->size());
+    const auto _f = flex();
+    return _f ? flexbuffers::GetRoot(_f->Data(), _f->size())
+              : flexbuffers::Reference();
   }
   const ::flatbuffers::Vector<const MyGame::Example::Test *> *test5() const {
     return GetPointer<const ::flatbuffers::Vector<const MyGame::Example::Test *> *>(VT_TEST5);
@@ -1722,7 +1726,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTREQUIREDNESTEDFLATBUFFER);
   }
   const MyGame::Example::Monster *testrequirednestedflatbuffer_nested_root() const {
-    return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testrequirednestedflatbuffer()->Data());
+    const auto _f = testrequirednestedflatbuffer();
+    return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())
+              : nullptr;
   }
   const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *scalar_key_sorted_tables() const {
     return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *>(VT_SCALAR_KEY_SORTED_TABLES);
diff --git a/tests/monster_test_suffix/monster_test_suffix.hpp b/tests/monster_test_suffix/monster_test_suffix.hpp
@@ -1487,7 +1487,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTNESTEDFLATBUFFER);
   }
   const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const {
-    return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data());
+    const auto _f = testnestedflatbuffer();
+    return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())
+              : nullptr;
   }
   const MyGame::Example::Stat *testempty() const {
     return GetPointer<const MyGame::Example::Stat *>(VT_TESTEMPTY);
@@ -1592,7 +1594,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_FLEX);
   }
   flexbuffers::Reference flex_flexbuffer_root() const {
-    return flexbuffers::GetRoot(flex()->Data(), flex()->size());
+    const auto _f = flex();
+    return _f ? flexbuffers::GetRoot(_f->Data(), _f->size())
+              : flexbuffers::Reference();
   }
   const ::flatbuffers::Vector<const MyGame::Example::Test *> *test5() const {
     return GetPointer<const ::flatbuffers::Vector<const MyGame::Example::Test *> *>(VT_TEST5);
@@ -1722,7 +1726,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTREQUIREDNESTEDFLATBUFFER);
   }
   const MyGame::Example::Monster *testrequirednestedflatbuffer_nested_root() const {
-    return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testrequirednestedflatbuffer()->Data());
+    const auto _f = testrequirednestedflatbuffer();
+    return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())
+              : nullptr;
   }
   const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *scalar_key_sorted_tables() const {
     return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *>(VT_SCALAR_KEY_SORTED_TABLES);

Original file line number	Diff line number	Diff line change
`@@ -1500,7 +1500,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {`
`1500`	`1500`	`return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTNESTEDFLATBUFFER);`
`1501`	`1501`	`}`
`1502`	`1502`	`const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const {`
`1503`		`- return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data());`
	`1503`	`+ const auto _f = testnestedflatbuffer();`
	`1504`	`+ return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())`
	`1505`	`+ : nullptr;`
`1504`	`1506`	`}`
`1505`	`1507`	`const MyGame::Example::Stat *testempty() const {`
`1506`	`1508`	`return GetPointer<const MyGame::Example::Stat *>(VT_TESTEMPTY);`
`@@ -1605,7 +1607,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {`
`1605`	`1607`	`return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_FLEX);`
`1606`	`1608`	`}`
`1607`	`1609`	`flexbuffers::Reference flex_flexbuffer_root() const {`
`1608`		`- return flexbuffers::GetRoot(flex()->Data(), flex()->size());`
	`1610`	`+ const auto _f = flex();`
	`1611`	`+ return _f ? flexbuffers::GetRoot(_f->Data(), _f->size())`
	`1612`	`+ : flexbuffers::Reference();`
`1609`	`1613`	`}`
`1610`	`1614`	`const ::flatbuffers::Vector<const MyGame::Example::Test > test5() const {`
`1611`	`1615`	`return GetPointer<const ::flatbuffers::Vector<const MyGame::Example::Test > >(VT_TEST5);`
`@@ -1735,7 +1739,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {`
`1735`	`1739`	`return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTREQUIREDNESTEDFLATBUFFER);`
`1736`	`1740`	`}`
`1737`	`1741`	`const MyGame::Example::Monster *testrequirednestedflatbuffer_nested_root() const {`
`1738`		`- return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testrequirednestedflatbuffer()->Data());`
	`1742`	`+ const auto _f = testrequirednestedflatbuffer();`
	`1743`	`+ return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())`
	`1744`	`+ : nullptr;`
`1739`	`1745`	`}`
`1740`	`1746`	`const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *scalar_key_sorted_tables() const {`
`1741`	`1747`	`return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *>(VT_SCALAR_KEY_SORTED_TABLES);`
Original file line number	Diff line number	Diff line change
`@@ -1487,7 +1487,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {`
`1487`	`1487`	`return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTNESTEDFLATBUFFER);`
`1488`	`1488`	`}`
`1489`	`1489`	`const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const {`
`1490`		`- return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data());`
	`1490`	`+ const auto _f = testnestedflatbuffer();`
	`1491`	`+ return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())`
	`1492`	`+ : nullptr;`
`1491`	`1493`	`}`
`1492`	`1494`	`const MyGame::Example::Stat *testempty() const {`
`1493`	`1495`	`return GetPointer<const MyGame::Example::Stat *>(VT_TESTEMPTY);`
`@@ -1592,7 +1594,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {`
`1592`	`1594`	`return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_FLEX);`
`1593`	`1595`	`}`
`1594`	`1596`	`flexbuffers::Reference flex_flexbuffer_root() const {`
`1595`		`- return flexbuffers::GetRoot(flex()->Data(), flex()->size());`
	`1597`	`+ const auto _f = flex();`
	`1598`	`+ return _f ? flexbuffers::GetRoot(_f->Data(), _f->size())`
	`1599`	`+ : flexbuffers::Reference();`
`1596`	`1600`	`}`
`1597`	`1601`	`const ::flatbuffers::Vector<const MyGame::Example::Test > test5() const {`
`1598`	`1602`	`return GetPointer<const ::flatbuffers::Vector<const MyGame::Example::Test > >(VT_TEST5);`
`@@ -1722,7 +1726,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {`
`1722`	`1726`	`return GetPointer<::flatbuffers::Vector<uint8_t> *>(VT_TESTREQUIREDNESTEDFLATBUFFER);`
`1723`	`1727`	`}`
`1724`	`1728`	`const MyGame::Example::Monster *testrequirednestedflatbuffer_nested_root() const {`
`1725`		`- return ::flatbuffers::GetRoot<MyGame::Example::Monster>(testrequirednestedflatbuffer()->Data());`
	`1729`	`+ const auto _f = testrequirednestedflatbuffer();`
	`1730`	`+ return _f ? ::flatbuffers::GetRoot<MyGame::Example::Monster>(_f->Data())`
	`1731`	`+ : nullptr;`
`1726`	`1732`	`}`
`1727`	`1733`	`const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *scalar_key_sorted_tables() const {`
`1728`	`1734`	`return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MyGame::Example::Stat>> *>(VT_SCALAR_KEY_SORTED_TABLES);`