diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-12-07 14:53:22 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-12-17 09:25:56 +0000 |
| commit | ad5c768fc8b93e22201fb557561b2edd4fcdc26b (patch) | |
| tree | 437f6d12153190e3f58e5e8524900fe0b204daf7 /src/3rdparty/libpng/pngmem.c | |
| parent | a88da6377da2e10998574ccc709bec014e2b75a5 (diff) | |
Update bundled libpng to version 1.6.19
Merged in the upstream version, which obsoleted some local
patches. The remaining diff to clean 1.6.19 is archived in
the qtpatches.diff file.
Change-Id: I676df2dab2c52c7fe576de284d472d70206f0a8c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
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 |