diff options
| author | thestig <thestig@chromium.org> | 2016-10-12 09:59:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-12 09:59:36 -0700 |
| commit | 8bc9b8b2ddeb3ffa904d8f35039550c55706ba86 (patch) | |
| tree | 84bd7922a5be3b1c2f23ccf4f0a1c6ec46873400 | |
| parent | 74b8c6ed314cfcc83aea13f028b4231db26e6ff8 (diff) | |
| download | pdfium-8bc9b8b2ddeb3ffa904d8f35039550c55706ba86.tar.xz | |
Check for more undefined behavior in CPDF_PSEngine.
BUG=chromium:639792
Review-Url: https://codereview.chromium.org/2415483002
| -rw-r--r-- | core/fpdfapi/page/fpdf_page_func.cpp | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/core/fpdfapi/page/fpdf_page_func.cpp b/core/fpdfapi/page/fpdf_page_func.cpp index 6af787ea49..d2e08a511c 100644 --- a/core/fpdfapi/page/fpdf_page_func.cpp +++ b/core/fpdfapi/page/fpdf_page_func.cpp @@ -20,7 +20,6 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "core/fxcrt/fx_safe_types.h" -#include "third_party/base/numerics/safe_conversions_impl.h" class CPDF_PSOP { public: @@ -180,8 +179,11 @@ FX_BOOL CPDF_PSProc::Parse(CPDF_SimpleParser* parser, int depth) { } FX_BOOL CPDF_PSEngine::DoOperator(PDF_PSOP op) { - int i1, i2; - FX_FLOAT d1, d2; + int i1; + int i2; + FX_FLOAT d1; + FX_FLOAT d2; + FX_SAFE_INT32 result; switch (op) { case PSOP_ADD: d1 = Pop(); @@ -204,14 +206,26 @@ FX_BOOL CPDF_PSEngine::DoOperator(PDF_PSOP op) { Push(d1 / d2); break; case PSOP_IDIV: - i2 = (int)Pop(); - i1 = (int)Pop(); - Push(i2 ? i1 / i2 : 0); + i2 = static_cast<int>(Pop()); + i1 = static_cast<int>(Pop()); + if (i2) { + result = i1; + result /= i2; + Push(result.ValueOrDefault(0)); + } else { + Push(0); + } break; case PSOP_MOD: - i2 = (int)Pop(); - i1 = (int)Pop(); - Push(i2 ? i1 % i2 : 0); + i2 = static_cast<int>(Pop()); + i1 = static_cast<int>(Pop()); + if (i2) { + result = i1; + result %= i2; + Push(result.ValueOrDefault(0)); + } else { + Push(0); + } break; case PSOP_NEG: d1 = Pop(); |