diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-03-15 13:26:37 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-15 21:10:29 +0000 |
| commit | a12159b17085796e2b72d2b49e850092e0b4e8b7 (patch) | |
| tree | df7a5d149c9bbfe5c2d2ec16631c3dcb6ae9a901 /core/fpdfapi/parser | |
| parent | 59d9416553b293f6df923c2f3ef33def2d51d7b7 (diff) | |
| download | pdfium-a12159b17085796e2b72d2b49e850092e0b4e8b7.tar.xz | |
Refactor some CPDF_ColorSpace code.
Change-Id: I1e30d68dae3bf70cf3c426f6126d593b7f1c3ba4
Reviewed-on: https://pdfium-review.googlesource.com/2991
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_security_handler.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfapi/parser/fpdf_parser_decode.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfapi/parser/cpdf_security_handler.cpp b/core/fpdfapi/parser/cpdf_security_handler.cpp index 61834fca13..cfc51350d9 100644 --- a/core/fpdfapi/parser/cpdf_security_handler.cpp +++ b/core/fpdfapi/parser/cpdf_security_handler.cpp @@ -52,7 +52,7 @@ void CalcEncryptKey(CPDF_Dictionary* pEncrypt, } if (!bIgnoreMeta && revision >= 3 && !pEncrypt->GetIntegerFor("EncryptMetadata", 1)) { - uint32_t tag = (uint32_t)-1; + uint32_t tag = 0xFFFFFFFF; CRYPT_MD5Update(&md5, (uint8_t*)&tag, 4); } uint8_t digest[16]; diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp index 98bb4eedf5..af1f452afd 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp @@ -101,9 +101,9 @@ uint32_t A85Decode(const uint8_t* src_buf, // Count the space needed to contain non-zero characters. The encoding ratio // of Ascii85 is 4:5. uint32_t space_for_non_zeroes = (pos - zcount) / 5 * 4 + 4; - if (zcount > (UINT_MAX - space_for_non_zeroes) / 4) { - return (uint32_t)-1; - } + if (zcount > (UINT_MAX - space_for_non_zeroes) / 4) + return 0xFFFFFFFF; + dest_buf = FX_Alloc(uint8_t, zcount * 4 + space_for_non_zeroes); size_t state = 0; uint32_t res = 0; @@ -315,7 +315,7 @@ uint32_t FPDFAPI_FlateOrLZWDecode(bool bLZW, BitsPerComponent = pParams->GetIntegerFor("BitsPerComponent", 8); Columns = pParams->GetIntegerFor("Columns", 1); if (!CheckFlateDecodeParams(Colors, BitsPerComponent, Columns)) - return (uint32_t)-1; + return 0xFFFFFFFF; } return CPDF_ModuleMgr::Get()->GetFlateModule()->FlateOrLZWDecode( bLZW, src_buf, src_size, bEarlyChange, predictor, Colors, @@ -358,7 +358,7 @@ bool PDF_DataDecode(const uint8_t* src_buf, CFX_ByteString decoder = DecoderArray[i].first; CPDF_Dictionary* pParam = ToDictionary(DecoderArray[i].second); uint8_t* new_buf = nullptr; - uint32_t new_size = (uint32_t)-1; + uint32_t new_size = 0xFFFFFFFF; int offset = -1; if (decoder == "FlateDecode" || decoder == "Fl") { if (bImageAcc && i == nSize - 1) { |