From a35063cb627d611e77816216d0d8946794a98079 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Wed, 25 Jul 2018 20:57:25 +0000
Subject: Change GetHeaderOffset() to return Optional<FX_FILESIZE>.

Remove |kInvalidHeaderOffset|.

Change-Id: I5978e745e97aa4e13299dd21028721725ac0c996
Reviewed-on: https://pdfium-review.googlesource.com/38853
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Art Snake <art-snake@yandex-team.ru>
---
 core/fpdfapi/parser/fpdf_parser_utility.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'core/fpdfapi/parser/fpdf_parser_utility.cpp')

diff --git a/core/fpdfapi/parser/fpdf_parser_utility.cpp b/core/fpdfapi/parser/fpdf_parser_utility.cpp
index 3c99415d21..83c967d8c2 100644
--- a/core/fpdfapi/parser/fpdf_parser_utility.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_utility.cpp
@@ -71,17 +71,18 @@ const char PDF_CharType[256] = {
     'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R',
     'R', 'R', 'R', 'R', 'R', 'R', 'R', 'W'};
 
-int32_t GetHeaderOffset(const RetainPtr<IFX_SeekableReadStream>& pFile) {
-  const size_t kBufSize = 4;
+Optional<FX_FILESIZE> GetHeaderOffset(
+    const RetainPtr<IFX_SeekableReadStream>& pFile) {
+  static constexpr size_t kBufSize = 4;
   uint8_t buf[kBufSize];
-  for (int32_t offset = 0; offset <= 1024; ++offset) {
+  for (FX_FILESIZE offset = 0; offset <= 1024; ++offset) {
     if (!pFile->ReadBlock(buf, offset, kBufSize))
-      return kInvalidHeaderOffset;
+      return {};
 
     if (memcmp(buf, "%PDF", 4) == 0)
       return offset;
   }
-  return kInvalidHeaderOffset;
+  return {};
 }
 
 int32_t GetDirectInteger(const CPDF_Dictionary* pDict, const ByteString& key) {
@@ -114,7 +115,7 @@ ByteString PDF_NameDecode(const ByteStringView& bstr) {
 }
 
 ByteString PDF_NameEncode(const ByteString& orig) {
-  uint8_t* src_buf = (uint8_t*)orig.c_str();
+  const uint8_t* src_buf = reinterpret_cast<const uint8_t*>(orig.c_str());
   int src_len = orig.GetLength();
   int dest_len = 0;
   int i;
-- 
cgit v1.2.3