diff options
| author | James Zern <jzern@google.com> | 2021-06-07 18:59:39 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2021-06-07 18:59:39 -0700 |
| commit | 109ff0f1003a154ba676727de426dd2d5c885a66 (patch) | |
| tree | 90f85bc58b8066467b9fc74ef467dd5589402fd0 | |
| parent | a2fce867449660623d75b2d5d3e65a1c0b86cf69 (diff) | |
| download | libwebp-109ff0f1003a154ba676727de426dd2d5c885a66.tar.gz | |
utils: allow MALLOC_LIMIT to indicate a max
in addition to checking the environment for "MALLOC_LIMIT"; the
environment will still take precedence.
this is in preparation for adding extreme config value coverage to
advanced_api_fuzzer
Bug: chromium:1196850
Change-Id: Ibe22f5e39e030a422fd6e383269bde35252d3fae
| -rw-r--r-- | src/utils/utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/utils/utils.c b/src/utils/utils.c index 6080e19e..d021d840 100644 --- a/src/utils/utils.c +++ b/src/utils/utils.c @@ -101,6 +101,9 @@ static void Increment(int* const v) { #if defined(MALLOC_LIMIT) { const char* const malloc_limit_str = getenv("MALLOC_LIMIT"); +#if MALLOC_LIMIT > 1 + mem_limit = (size_t)MALLOC_LIMIT; +#endif if (malloc_limit_str != NULL) { mem_limit = atoi(malloc_limit_str); } @@ -175,7 +178,7 @@ static int CheckSizeArgumentsOverflow(uint64_t nmemb, size_t size) { return 0; // fake fail! } #endif -#if defined(MALLOC_LIMIT) +#if defined(PRINT_MEM_INFO) && defined(MALLOC_LIMIT) if (mem_limit > 0) { const uint64_t new_total_mem = (uint64_t)total_mem + total_size; if (new_total_mem != (size_t)new_total_mem || |