diff options
| author | tsepez <tsepez@chromium.org> | 2017-01-23 14:36:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2017-01-23 14:36:20 -0800 |
| commit | 4022f87eb8716155291543efaaf289e51d7cbf43 (patch) | |
| tree | 28e2a3b99367932ee84a92b1f6c913245e62afb1 /core/fpdfapi/parser | |
| parent | b76f49b36baffea2b2ecb90d67c7b6bb734e7bb9 (diff) | |
| download | pdfium-4022f87eb8716155291543efaaf289e51d7cbf43.tar.xz | |
Update safe numerics package to get bitwise ops
Fix callers conventions to avoid ambiguity.
Fix bad bounds check unmasked by change.
Directly include headers no longer pulled in by numerics itself.
Review-Url: https://codereview.chromium.org/2640143003
Diffstat (limited to 'core/fpdfapi/parser')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_hint_tables.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/fpdfapi/parser/cpdf_hint_tables.cpp b/core/fpdfapi/parser/cpdf_hint_tables.cpp index 5c0f2a7fbe..e000188e7d 100644 --- a/core/fpdfapi/parser/cpdf_hint_tables.cpp +++ b/core/fpdfapi/parser/cpdf_hint_tables.cpp @@ -257,7 +257,7 @@ bool CPDF_HintTables::ReadSharedObjHintTable(CFX_BitStream* hStream, bit_offset *= 8; if (!bit_offset.IsValid() || hStream->GetPos() > bit_offset.ValueOrDie()) return false; - hStream->SkipBits(bit_offset.ValueOrDie() - hStream->GetPos()); + hStream->SkipBits((bit_offset - hStream->GetPos()).ValueOrDie()); const uint32_t kHeaderSize = 192; if (hStream->BitsRemaining() < kHeaderSize) diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp index efb9f84059..ef3de92f76 100644 --- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp +++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp @@ -11,6 +11,7 @@ #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfapi/parser/cpdf_parser.h" +#include "third_party/base/logging.h" CPDF_IndirectObjectHolder::CPDF_IndirectObjectHolder() : m_LastObjNum(0), |