@@ -18,6 +18,7 @@ limitations under the License.
1818#include < stdlib.h>
1919#include < string.h>
2020
21+ #include < limits>
2122#include < map>
2223#include < memory>
2324#include < string>
@@ -511,6 +512,89 @@ TEST(BasicFlatBufferModel, TestInvalidBlockwiseQuantizationDetails) {
511512 kTfLiteError );
512513}
513514
515+ // A constant tensor whose Buffer lives outside the flatbuffer, addressed by an
516+ // (offset, size) pair chosen so that offset + size wraps around uint64 to a
517+ // small value. The model is loaded without the verifier on purpose, so the
518+ // bounds check in InterpreterBuilder::ParseTensors is what has to reject it.
519+ TEST (BasicFlatBufferModel, TestRejectsWrappingExternalBufferOffset) {
520+ flatbuffers::FlatBufferBuilder builder;
521+ const uint64_t offset = std::numeric_limits<uint64_t >::max () - 10 ;
522+ const uint64_t size = 20 ; // offset + size wraps to 9.
523+ std::vector<int32_t > shape = {5 }; // 5 x float32 == 20 bytes == size.
524+ auto tensor =
525+ ::tflite::CreateTensorDirect (builder, &shape, tflite::TensorType_FLOAT32,
526+ /* buffer=*/ 1 , " weights" );
527+ std::vector<flatbuffers::Offset<::tflite::Tensor>> tensors = {tensor};
528+ auto subgraph = ::tflite::CreateSubGraphDirect (
529+ builder, &tensors, /* inputs=*/ nullptr , /* outputs=*/ nullptr ,
530+ /* operators=*/ nullptr , " subgraph" );
531+ std::vector<flatbuffers::Offset<::tflite::SubGraph>> subgraphs = {subgraph};
532+ std::vector<flatbuffers::Offset<::tflite::Buffer>> buffers = {
533+ ::tflite::CreateBuffer (builder),
534+ ::tflite::CreateBuffer(builder, /* data=*/ 0 , offset, size)};
535+ auto model = ::tflite::CreateModelDirect (builder, TFLITE_SCHEMA_VERSION ,
536+ /* operator_codes=*/ nullptr ,
537+ &subgraphs, " model" , &buffers);
538+ ::tflite::FinishModelBuffer (builder, model);
539+ auto fb_model = FlatBufferModel::BuildFromBuffer (
540+ reinterpret_cast <const char *>(builder.GetBufferPointer ()),
541+ builder.GetSize ());
542+ ASSERT_TRUE (fb_model);
543+ std::unique_ptr<Interpreter> interpreter;
544+ TrivialResolver resolver;
545+ EXPECT_NE (InterpreterBuilder (*fb_model, resolver)(&interpreter), kTfLiteOk );
546+ }
547+
548+ // The same wrapping pair on a custom op's large_custom_options, which is the
549+ // InterpreterBuilder::ParseNodes side of the check.
550+ TEST (BasicFlatBufferModel, TestRejectsWrappingLargeCustomOptionsOffset) {
551+ flatbuffers::FlatBufferBuilder builder;
552+ const uint64_t offset = std::numeric_limits<uint64_t >::max () - 10 ;
553+ const uint64_t size = 20 ; // offset + size wraps to 9.
554+ std::vector<int32_t > shape = {1 };
555+ auto tensor =
556+ ::tflite::CreateTensorDirect (builder, &shape, tflite::TensorType_FLOAT32,
557+ /* buffer=*/ 0 , " t" );
558+ std::vector<flatbuffers::Offset<::tflite::Tensor>> tensors = {tensor};
559+ std::vector<int32_t > inputs = {0 };
560+ std::vector<int32_t > outputs = {0 };
561+ auto inputs_vector = builder.CreateVector (inputs);
562+ auto outputs_vector = builder.CreateVector (outputs);
563+ ::tflite::OperatorBuilder op (builder);
564+ op.add_opcode_index (0 );
565+ op.add_inputs (inputs_vector);
566+ op.add_outputs (outputs_vector);
567+ op.add_large_custom_options_offset (offset);
568+ op.add_large_custom_options_size (size);
569+ std::vector<flatbuffers::Offset<::tflite::Operator>> operators = {
570+ op.Finish ()};
571+ auto subgraph = ::tflite::CreateSubGraphDirect (
572+ builder, &tensors, &inputs, &outputs, &operators, " subgraph" );
573+ std::vector<flatbuffers::Offset<::tflite::SubGraph>> subgraphs = {subgraph};
574+ std::vector<flatbuffers::Offset<::tflite::OperatorCode>> operator_codes = {
575+ ::tflite::CreateOperatorCodeDirect (
576+ builder, /* deprecated_builtin_code=*/ tflite::BuiltinOperator_CUSTOM,
577+ " WRAP" , /* version=*/ 1 , tflite::BuiltinOperator_CUSTOM)};
578+ std::vector<flatbuffers::Offset<::tflite::Buffer>> buffers = {
579+ ::tflite::CreateBuffer (builder)};
580+ auto model = ::tflite::CreateModelDirect (builder, TFLITE_SCHEMA_VERSION ,
581+ &operator_codes, &subgraphs, " model" ,
582+ &buffers);
583+ ::tflite::FinishModelBuffer (builder, model);
584+ auto fb_model = FlatBufferModel::BuildFromBuffer (
585+ reinterpret_cast <const char *>(builder.GetBufferPointer ()),
586+ builder.GetSize ());
587+ ASSERT_TRUE (fb_model);
588+ std::unique_ptr<Interpreter> interpreter;
589+ // ParseNodes keys off registration->builtin_code, so the resolved
590+ // registration itself must be marked CUSTOM.
591+ TfLiteRegistration custom_reg = dummy_reg;
592+ custom_reg.builtin_code = tflite::BuiltinOperator_CUSTOM;
593+ custom_reg.custom_name = " WRAP" ;
594+ TrivialResolver resolver (&custom_reg);
595+ EXPECT_NE (InterpreterBuilder (*fb_model, resolver)(&interpreter), kTfLiteOk );
596+ }
597+
514598TEST (BasicFlatBufferModel, TestWithNumThreads) {
515599 TestErrorReporter reporter;
516600 auto model = FlatBufferModel::BuildFromFile (
0 commit comments