Version 5.4.3.2, tag libreoffice-5.4.3.2
[LibreOffice.git] / external / pdfium / macos.patch.1
blob360e54a2ca86ec5bd0ab9b3ba3baecb74490a45f
1 diff --git a/core/fpdfapi/parser/cpdf_hint_tables.cpp b/core/fpdfapi/parser/cpdf_hint_tables.cpp
2 index e000188..39fd200 100644
3 --- a/core/fpdfapi/parser/cpdf_hint_tables.cpp
4 +++ b/core/fpdfapi/parser/cpdf_hint_tables.cpp
5 @@ -150,7 +150,8 @@ bool CPDF_HintTables::ReadPageHintTable(CFX_BitStream* hStream) {
6      safeDeltaObj += dwObjLeastNum;
7      if (!safeDeltaObj.IsValid())
8        return false;
9 -    m_dwDeltaNObjsArray.push_back(safeDeltaObj.ValueOrDie());
10 +    uint32_t deltaObj = safeDeltaObj.ValueOrDie();
11 +    m_dwDeltaNObjsArray.push_back(deltaObj);
12    }
13    hStream->ByteAlign();
15 @@ -166,7 +167,8 @@ bool CPDF_HintTables::ReadPageHintTable(CFX_BitStream* hStream) {
16      if (!safePageLen.IsValid())
17        return false;
19 -    dwPageLenArray.push_back(safePageLen.ValueOrDie());
20 +    uint32_t pageLen = safePageLen.ValueOrDie();
21 +    dwPageLenArray.push_back(pageLen);
22    }
24    int nOffsetE = GetEndOfFirstPageOffset();
25 @@ -325,13 +327,15 @@ bool CPDF_HintTables::ReadSharedObjHintTable(CFX_BitStream* hStream,
26        if (!safeObjNum.IsValid())
27          return false;
29 -      m_dwSharedObjNumArray.push_back(safeObjNum.ValueOrDie());
30 +      uint32_t objNum = safeObjNum.ValueOrDie();
31 +      m_dwSharedObjNumArray.push_back(objNum);
32        if (i == m_nFirstPageSharedObjs) {
33          FX_SAFE_FILESIZE safeLoc = dwFirstSharedObjLoc;
34          if (!safeLoc.IsValid())
35            return false;
37 -        m_szSharedObjOffsetArray.push_back(safeLoc.ValueOrDie());
38 +        FX_FILESIZE loc = safeLoc.ValueOrDie();
39 +        m_szSharedObjOffsetArray.push_back(loc);
40        }
41      }
43 @@ -341,7 +345,8 @@ bool CPDF_HintTables::ReadSharedObjHintTable(CFX_BitStream* hStream,
44        if (!safeLoc.IsValid())
45          return false;
47 -      m_szSharedObjOffsetArray.push_back(safeLoc.ValueOrDie());
48 +      FX_FILESIZE loc = safeLoc.ValueOrDie();
49 +      m_szSharedObjOffsetArray.push_back(loc);
50      }
51    }
53 @@ -351,7 +356,8 @@ bool CPDF_HintTables::ReadSharedObjHintTable(CFX_BitStream* hStream,
54      if (!safeLoc.IsValid())
55        return false;
57 -    m_szSharedObjOffsetArray.push_back(safeLoc.ValueOrDie());
58 +    FX_FILESIZE loc = safeLoc.ValueOrDie();
59 +    m_szSharedObjOffsetArray.push_back(loc);
60    }
62    hStream->ByteAlign();