get rid of uptrval

Author: daniellerozenblit

contrib/linux-kernel/mem.h

@@ -38,7 +38,6 @@ typedef uint32_t U32;
 typedef int32_t  S32;
 typedef uint64_t U64;
 typedef int64_t  S64;
-typedef uintptr_t uptrval;
 
 /*-**************************************************************
 *  Memory I/O API

lib/common/mem.h

@@ -59,7 +59,6 @@ extern "C" {
   typedef   int32_t S32;
   typedef  uint64_t U64;
   typedef   int64_t S64;
-  typedef uintptr_t uptrval;
 #else
 # include <limits.h>
 #if CHAR_BIT != 8
@@ -82,7 +81,6 @@ extern "C" {
  * limits exist in C99, however, in such case, <stdint.h> is preferred */
   typedef unsigned long long  U64;
   typedef   signed long long  S64;
-  typedef size_t              uptrval;   /* generally true, except OpenVMS-64 */
 #endif
 
 

lib/decompress/zstd_decompress_block.c

@@ -2124,9 +2124,8 @@ ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,
         ip += seqHSize;
         srcSize -= seqHSize;
 
-        RETURN_ERROR_IF(dst == NULL && nbSeq > 0, dstSize_tooSmall, "NULL not handled");
-        RETURN_ERROR_IF(dstCapacity == 0 && nbSeq > 0, dstSize_tooSmall, "dstCapacity == 0, but nbSeq is non-zero");
-        RETURN_ERROR_IF(MEM_64bits() && (uptrval)dst + dstCapacity > (uptrval)-1 - (1 << 20), dstSize_tooSmall,
+        RETURN_ERROR_IF((dst == NULL) ^ (dstCapacity == 0), dstSize_tooSmall, "NULL not handled");
+        RETURN_ERROR_IF(MEM_64bits() && (const char*)(size_t)(-1) - (const char*)dst < (U64)(1 << 20), dstSize_tooSmall,
                 "invalid dst");
 
         /* If we could potentially have long offsets, or we might want to use the prefetch decoder,