Update safe numerics package to get bitwise ops

core/fxcrt/fx_basic_array.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcrt/fx_basic.h"
 #include "third_party/base/numerics/safe_math.h"
 
 CFX_BasicArray::CFX_BasicArray(int unit_size)
@@ skipping 15 matching lines @@
     return 0 == nNewSize;
   }
 
   if (!m_pData) {
     pdfium::base::CheckedNumeric<int> totalSize = nNewSize;
     totalSize *= m_nUnitSize;
     if (!totalSize.IsValid()) {
       m_nSize = m_nMaxSize = 0;
       return false;
     }
-    m_pData = FX_Alloc(uint8_t, totalSize.ValueOrDie());
+    m_pData = FX_Alloc(uint8_t, totalSize.ValueOrDie<size_t>());

[jschuh, 2017/01/23 17:05:19]

Weird. I'm not sure how this compiles without doing one of these (equivalent)
things:
  totalSize.template ValueOrDie<size_t>()
          - or -
  ValueOrDieForType<size_t>(totalSize)

[Tom Sepez, 2017/01/23 18:19:14]

Ok, I'll switch to the functional form just in case we get a less sophisticated
compiler front end sometime down the road ...

     m_nSize = m_nMaxSize = nNewSize;
   } else if (nNewSize <= m_nMaxSize) {
     if (nNewSize > m_nSize) {
       FXSYS_memset(m_pData + m_nSize * m_nUnitSize, 0,
                    (nNewSize - m_nSize) * m_nUnitSize);
     }
     m_nSize = nNewSize;
   } else {
     int nNewMax = nNewSize < m_nMaxSize ? m_nMaxSize : nNewSize;
     pdfium::base::CheckedNumeric<int> totalSize = nNewMax;
     totalSize *= m_nUnitSize;
     if (!totalSize.IsValid() || nNewMax < m_nSize) {
       return false;
     }
-    uint8_t* pNewData = FX_Realloc(uint8_t, m_pData, totalSize.ValueOrDie());
+    uint8_t* pNewData =
+        FX_Realloc(uint8_t, m_pData, totalSize.ValueOrDie<size_t>());

[jschuh, 2017/01/23 17:05:19]

Same question for this and the other uses below.

[Tom Sepez, 2017/01/23 18:19:14]

Done.

     if (!pNewData) {
       return false;
     }
     FXSYS_memset(pNewData + m_nSize * m_nUnitSize, 0,
                  (nNewMax - m_nSize) * m_nUnitSize);
     m_pData = pNewData;
     m_nSize = nNewSize;
     m_nMaxSize = nNewMax;
   }
   return true;
@@ skipping 65 matching lines @@
   FXSYS_memcpy(m_pData + nStartIndex * m_nUnitSize, pNewArray->m_pData,
                pNewArray->m_nSize * m_nUnitSize);
   return true;
 }
 const void* CFX_BasicArray::GetDataPtr(int index) const {
   if (index < 0 || index >= m_nSize || !m_pData) {
     return nullptr;
   }
   return m_pData + index * m_nUnitSize;
 }