diff --git a/extension/data_loader/buffer_data_loader.h b/extension/data_loader/buffer_data_loader.h index 7f4211546e0..64e26d3dcb8 100644 --- a/extension/data_loader/buffer_data_loader.h +++ b/extension/data_loader/buffer_data_loader.h @@ -40,7 +40,7 @@ class BufferDataLoader final : public executorch::runtime::DataLoader { ET_CHECK_OR_RETURN_ERROR( !overflow && total_size <= size_, InvalidArgument, - "offset %zu + size %zu > size_ %zu, or overflow detected", + "offset %zu + size %zu > size_ %zu", offset, size, size_); diff --git a/extension/data_loader/file_data_loader.cpp b/extension/data_loader/file_data_loader.cpp index bc5c17ef33f..997585aa9d1 100644 --- a/extension/data_loader/file_data_loader.cpp +++ b/extension/data_loader/file_data_loader.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -144,12 +143,10 @@ Result FileDataLoader::load( fd_ >= 0, InvalidState, "Uninitialized"); - size_t total_size; - bool overflow = c10::add_overflows(offset, size, &total_size); ET_CHECK_OR_RETURN_ERROR( - !overflow && total_size <= file_size_, + offset + size <= file_size_, InvalidArgument, - "File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected", + "File %s: offset %zu + size %zu > file_size_ %zu", file_name_, offset, size, @@ -207,12 +204,10 @@ ET_NODISCARD Error FileDataLoader::load_into( fd_ >= 0, InvalidState, "Uninitialized"); - size_t total_size; - bool overflow = c10::add_overflows(offset, size, &total_size); ET_CHECK_OR_RETURN_ERROR( - !overflow && total_size <= file_size_, + offset + size <= file_size_, InvalidArgument, - "File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected", + "File %s: offset %zu + size %zu > file_size_ %zu", file_name_, offset, size, diff --git a/extension/data_loader/file_descriptor_data_loader.cpp b/extension/data_loader/file_descriptor_data_loader.cpp index 3b6423d21cb..a57f2ce3640 100644 --- a/extension/data_loader/file_descriptor_data_loader.cpp +++ b/extension/data_loader/file_descriptor_data_loader.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -158,12 +157,10 @@ Result FileDescriptorDataLoader::load( fd_ >= 0, InvalidState, "Uninitialized"); - size_t total_size; - bool overflow = c10::add_overflows(offset, size, &total_size); ET_CHECK_OR_RETURN_ERROR( - !overflow && total_size <= file_size_, + offset + size <= file_size_, InvalidArgument, - "File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected", + "File %s: offset %zu + size %zu > file_size_ %zu", file_descriptor_uri_, offset, size, @@ -221,12 +218,10 @@ ET_NODISCARD Error FileDescriptorDataLoader::load_into( fd_ >= 0, InvalidState, "Uninitialized"); - size_t total_size; - bool overflow = c10::add_overflows(offset, size, &total_size); ET_CHECK_OR_RETURN_ERROR( - !overflow && total_size <= file_size_, + offset + size <= file_size_, InvalidArgument, - "File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected", + "File %s: offset %zu + size %zu > file_size_ %zu", file_descriptor_uri_, offset, size, diff --git a/extension/data_loader/mmap_data_loader.cpp b/extension/data_loader/mmap_data_loader.cpp index 5d77b67cc59..2271d5a3690 100644 --- a/extension/data_loader/mmap_data_loader.cpp +++ b/extension/data_loader/mmap_data_loader.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -160,12 +159,10 @@ Error MmapDataLoader::validate_input(size_t offset, size_t size) const { fd_ >= 0, InvalidState, "Uninitialized"); - size_t total_size; - bool overflow = c10::add_overflows(offset, size, &total_size); ET_CHECK_OR_RETURN_ERROR( - !overflow && total_size <= file_size_, + offset + size <= file_size_, InvalidArgument, - "File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected", + "File %s: offset %zu + size %zu > file_size_ %zu", file_name_, offset, size, diff --git a/extension/data_loader/shared_ptr_data_loader.h b/extension/data_loader/shared_ptr_data_loader.h index 78fdc2b7157..551ab4d498c 100644 --- a/extension/data_loader/shared_ptr_data_loader.h +++ b/extension/data_loader/shared_ptr_data_loader.h @@ -8,7 +8,6 @@ #pragma once -#include #include #include #include @@ -34,12 +33,10 @@ class SharedPtrDataLoader final : public executorch::runtime::DataLoader { size_t offset, size_t size, ET_UNUSED const DataLoader::SegmentInfo& segment_info) const override { - size_t total_size; - bool overflow = c10::add_overflows(offset, size, &total_size); ET_CHECK_OR_RETURN_ERROR( - !overflow && total_size <= size_, + offset + size <= size_, InvalidArgument, - "offset %zu + size %zu > size_ %zu, or overflow detected", + "offset %zu + size %zu > size_ %zu", offset, size, size_);