dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-10-30 01:53:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "fix a potential overflow with MALLOC_LIMIT"

Browse Source
This commit is contained in:
Pascal Massimino
2016-12-13 06:10:56 +00:00
committed by Gerrit Code Review
parent 273367c130 76bbcf2ed6
commit 827d3c5038
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/utils.c
View File

@@ -175,9 +175,13 @@ static int CheckSizeArgumentsOverflow(uint64_t nmemb, size_t size) {
}
#endif
#if defined(MALLOC_LIMIT)
if (mem_limit > 0 && total_mem + total_size >= mem_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 ||
new_total_mem > mem_limit) {
return 0; // fake fail!
}
}
#endif
return 1;