Commit 35955179 authored by Kamil Dudka's avatar Kamil Dudka
Browse files

CURL_LLONG_MAX: avoid constant overflow 

... when (CURL_SIZEOF_CURL_OFF_T == 4)
parent b1c1b9bb

lib/strtoofft.h

+6 −1
Original line number Diff line number Diff line
@@ -57,7 +57,12 @@ 
#  define curlx_strtoofft strtol

#endif



#if (CURL_SIZEOF_CURL_OFF_T == 4)

#  define CURL_LLONG_MAX CURL_OFF_T_C(0x7FFFFFFF)

#else

   /* assume CURL_SIZEOF_CURL_OFF_T == 8 */

#  define CURL_LLONG_MAX CURL_OFF_T_C(0x7FFFFFFFFFFFFFFF)

#endif

#define CURL_LLONG_MIN (-CURL_LLONG_MAX - CURL_OFF_T_C(1))



#endif /* HEADER_CURL_STRTOOFFT_H */

tests/libtest/lib576.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ long chunk_bgn(const struct curl_fileinfo *finfo, void *ptr, int remains) 
      printf(" (parsed => %o)", finfo->perm);

    printf("\n");

  }

  printf("Size:         %lldB\n", (long long int)finfo->size);

  printf("Size:         %ldB\n", (long)finfo->size);

  if(finfo->strings.user)

    printf("User:         %s\n", finfo->strings.user);

  if(finfo->strings.group)