src/java.base/share/native/libjava/sizecalc.h

*** 42,52 ****
  /* http://stackoverflow.com/questions/3472311/what-is-a-portable-method-to-find-the-maximum-value-of-size-t */
  #ifndef SIZE_MAX
  #define SIZE_MAX ((size_t)-1)
  #endif
  
! #define IS_SAFE_SIZE_T(x) ((x) >= 0 && (unsigned long long)(x) <= SIZE_MAX)
  
  #define IS_SAFE_SIZE_MUL(m, n) \
      (IS_SAFE_SIZE_T(m) && IS_SAFE_SIZE_T(n) && ((m) == 0 || (n) == 0 || (size_t)(n) <= (SIZE_MAX / (size_t)(m))))
  
  #define IS_SAFE_SIZE_ADD(a, b) \
--- 42,52 ----
  /* http://stackoverflow.com/questions/3472311/what-is-a-portable-method-to-find-the-maximum-value-of-size-t */
  #ifndef SIZE_MAX
  #define SIZE_MAX ((size_t)-1)
  #endif
  
! #define IS_SAFE_SIZE_T(x) (((x) + 1) > 0 && (unsigned long long)(x) - 1u < SIZE_MAX)
  
  #define IS_SAFE_SIZE_MUL(m, n) \
      (IS_SAFE_SIZE_T(m) && IS_SAFE_SIZE_T(n) && ((m) == 0 || (n) == 0 || (size_t)(n) <= (SIZE_MAX / (size_t)(m))))
  
  #define IS_SAFE_SIZE_ADD(a, b) \