summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-11-07 15:16:01 -0800
committerCommit bot <commit-bot@chromium.org>2016-11-07 15:16:01 -0800
commit4e597c8fd5d604273266ea19a1074a2c870ba224 (patch)
tree6311f6884e5316cb0c481cc141a08f8984cbfa6e /fpdfsdk
parent0d830c1e0db684d17f9b3c534dec8cecb17b674d (diff)
downloadpdfium-4e597c8fd5d604273266ea19a1074a2c870ba224.tar.xz
Force compiler to deduce src type for checked_cast<dst, src>.
Otherwise, we might be silently doing an unsafe cast before applying the check if the actual argument doesn't match the exact src type. Review-Url: https://codereview.chromium.org/2484953003
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fpdfview.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index 9142dc78c9..334c14cd45 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -192,8 +192,7 @@ bool CPDF_CustomAccess::ReadBlock(void* buffer,
if (offset < 0)
return false;
- FX_SAFE_FILESIZE newPos =
- pdfium::base::checked_cast<FX_FILESIZE, size_t>(size);
+ FX_SAFE_FILESIZE newPos = pdfium::base::checked_cast<FX_FILESIZE>(size);
newPos += offset;
if (!newPos.IsValid() ||
newPos.ValueOrDie() > static_cast<FX_FILESIZE>(m_FileAccess.m_FileLen)) {
@@ -388,8 +387,7 @@ class CMemFile final : public IFX_SeekableReadStream {
if (offset < 0) {
return false;
}
- FX_SAFE_FILESIZE newPos =
- pdfium::base::checked_cast<FX_FILESIZE, size_t>(size);
+ FX_SAFE_FILESIZE newPos = pdfium::base::checked_cast<FX_FILESIZE>(size);
newPos += offset;
if (!newPos.IsValid() || newPos.ValueOrDie() > m_size) {
return false;