diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 11:27:37 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 11:27:37 +0000 |
| commit | 0a1af55a9b69f7fd58dbce43a0d4c1faf0143838 (patch) | |
| tree | 26da168e740734d168be37803abec2f8739b213d /src/3rdparty/libpng/pngmem.c | |
| parent | b8fb0ee999d32401157be8d86e5a03185aadbb9e (diff) | |
| parent | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/3rdparty/libpng/pngmem.c')
| -rw-r--r-- | src/3rdparty/libpng/pngmem.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/libpng/pngmem.c b/src/3rdparty/libpng/pngmem.c index 8b157e54d2..45ac5579b2 100644 --- a/src/3rdparty/libpng/pngmem.c +++ b/src/3rdparty/libpng/pngmem.c @@ -77,6 +77,9 @@ png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size), PNG_UNUSED(png_ptr) #endif + /* Some compilers complain that this is always true. However, it + * can be false when integer overflow happens. + */ if (size > 0 && size <= PNG_SIZE_MAX # ifdef PNG_MAX_MALLOC_64K && size <= 65536U |