From f037d60c75917d59fc2c739f7a7cbaec053e2226 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 13 Mar 2022 03:30:17 -0700 Subject: [PATCH] strat: minor result/overflow check fixes --- .../include/stratosphere/fs/fsa/fs_ifile.hpp | 20 ++++++++----------- .../time/impl/util/time_impl_util_api.cpp | 6 +----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/libstratosphere/include/stratosphere/fs/fsa/fs_ifile.hpp b/libstratosphere/include/stratosphere/fs/fsa/fs_ifile.hpp index 9ca61db0..68775180 100644 --- a/libstratosphere/include/stratosphere/fs/fsa/fs_ifile.hpp +++ b/libstratosphere/include/stratosphere/fs/fsa/fs_ifile.hpp @@ -36,12 +36,10 @@ namespace ams::fs::fsa { } /* Check that the read is valid. */ - R_UNLESS(buffer != nullptr, fs::ResultNullptrArgument()); - R_UNLESS(offset >= 0, fs::ResultOutOfRange()); - R_UNLESS(util::IsIntValueRepresentable(size), fs::ResultOutOfRange()); - - const s64 signed_size = static_cast(size); - R_UNLESS((std::numeric_limits::max() - offset) >= signed_size, fs::ResultOutOfRange()); + R_UNLESS(buffer != nullptr, fs::ResultNullptrArgument()); + R_UNLESS(offset >= 0, fs::ResultOutOfRange()); + R_UNLESS(util::IsIntValueRepresentable(size), fs::ResultOutOfRange()); + R_UNLESS(util::CanAddWithoutOverflow(offset, size), fs::ResultOutOfRange()); /* Do the read. */ R_RETURN(this->DoRead(out, offset, buffer, size, option)); @@ -68,12 +66,10 @@ namespace ams::fs::fsa { } /* Check the write is valid. */ - R_UNLESS(buffer != nullptr, fs::ResultNullptrArgument()); - R_UNLESS(offset >= 0, fs::ResultOutOfRange()); - R_UNLESS(util::IsIntValueRepresentable(size), fs::ResultOutOfRange()); - - const s64 signed_size = static_cast(size); - R_UNLESS((std::numeric_limits::max() - offset) >= signed_size, fs::ResultOutOfRange()); + R_UNLESS(buffer != nullptr, fs::ResultNullptrArgument()); + R_UNLESS(offset >= 0, fs::ResultOutOfRange()); + R_UNLESS(util::IsIntValueRepresentable(size), fs::ResultOutOfRange()); + R_UNLESS(util::CanAddWithoutOverflow(offset, size), fs::ResultOutOfRange()); R_RETURN(this->DoWrite(offset, buffer, size, option)); } diff --git a/libstratosphere/source/time/impl/util/time_impl_util_api.cpp b/libstratosphere/source/time/impl/util/time_impl_util_api.cpp index 8cb8f961..3226db2b 100644 --- a/libstratosphere/source/time/impl/util/time_impl_util_api.cpp +++ b/libstratosphere/source/time/impl/util/time_impl_util_api.cpp @@ -157,11 +157,7 @@ namespace ams::time::impl::util { R_UNLESS(out != nullptr, time::ResultInvalidPointer()); R_UNLESS(from.source_id == to.source_id, time::ResultNotComparable()); - const bool no_overflow = (from.value >= 0 ? (to.value >= std::numeric_limits::min() + from.value) - : (to.value <= std::numeric_limits::max() + from.value)); - R_UNLESS(no_overflow, time::ResultOverflowed()); - - *out = to.value - from.value; + R_UNLESS(ams::util::TrySubtractWithoutOverflow(out, to.value, from.value), time::ResultOverflowed()); return ResultSuccess(); }