cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16]Change "int" to "png_uint_32" in intel/filter_sse2.c to prevent

Browse Source 
possible integer overflow (Bug report by John Bowler).
This commit is contained in:
Glenn Randers-Pehrson 2017-07-09 08:26:54 -05:00
parent 76b3a7e78f
commit 5cc23552a7
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ANNOUNCE
View File

@ -76,6 +76,8 @@ Version 1.6.31beta02 [July 8, 2017]
Version 1.6.31beta03 [July 9, 2017] Version 1.6.31beta03 [July 9, 2017]
Updated CMakeLists.txt to add INTEL_SSE and MIPS_MSA platforms. Updated CMakeLists.txt to add INTEL_SSE and MIPS_MSA platforms.
Change "int" to "png_uint_32" in intel/filter_sse2.c to prevent
possible integer overflow (Bug report by John Bowler).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

2
CHANGES
View File

@ -5871,6 +5871,8 @@ Version 1.6.31beta02 [July 8, 2017]
Version 1.6.31beta03 [July 9, 2017] Version 1.6.31beta03 [July 9, 2017]
Updated CMakeLists.txt to add INTEL_SSE and MIPS_MSA platforms. Updated CMakeLists.txt to add INTEL_SSE and MIPS_MSA platforms.
Change "int" to "png_uint_32" in intel/filter_sse2.c to prevent
possible integer overflow (Bug report by John Bowler).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

20
intel/filter_sse2_intrinsics.c
View File

@ -5,7 +5,7 @@
* Written by Mike Klein and Matt Sarett * Written by Mike Klein and Matt Sarett
* Derived from arm/filter_neon_intrinsics.c * Derived from arm/filter_neon_intrinsics.c
* *
* Last changed in libpng 1.6.29 [March 16, 2017] * Last changed in libpng 1.6.31 [(PENDING RELEASE)]
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer
@ -71,7 +71,7 @@ void png_read_filter_row_sub3_sse2(png_row_infop row_info, png_bytep row,
png_debug(1, "in png_read_filter_row_sub3_sse2"); png_debug(1, "in png_read_filter_row_sub3_sse2");
__m128i a, d = _mm_setzero_si128(); __m128i a, d = _mm_setzero_si128();
int rb = row_info->rowbytes; png_uint_32 rb = row_info->rowbytes;
while (rb >= 4) { while (rb >= 4) {
a = d; d = load4(row); a = d; d = load4(row);
d = _mm_add_epi8(d, a); d = _mm_add_epi8(d, a);
@ -100,8 +100,8 @@ void png_read_filter_row_sub4_sse2(png_row_infop row_info, png_bytep row,
png_debug(1, "in png_read_filter_row_sub4_sse2"); png_debug(1, "in png_read_filter_row_sub4_sse2");
__m128i a, d = _mm_setzero_si128(); __m128i a, d = _mm_setzero_si128();
int rb = row_info->rowbytes; png_uint_32 rb = row_info->rowbytes+4;
while (rb > 0) { while (rb > 4) {
a = d; d = load4(row); a = d; d = load4(row);
d = _mm_add_epi8(d, a); d = _mm_add_epi8(d, a);
store4(row, d); store4(row, d);
@ -124,7 +124,7 @@ void png_read_filter_row_avg3_sse2(png_row_infop row_info, png_bytep row,
__m128i b; __m128i b;
__m128i a, d = zero; __m128i a, d = zero;
int rb = row_info->rowbytes; png_uint_32 rb = row_info->rowbytes;
while (rb >= 4) { while (rb >= 4) {
b = load4(prev); b = load4(prev);
a = d; d = load4(row ); a = d; d = load4(row );
@ -173,8 +173,8 @@ void png_read_filter_row_avg4_sse2(png_row_infop row_info, png_bytep row,
__m128i b; __m128i b;
__m128i a, d = zero; __m128i a, d = zero;
int rb = row_info->rowbytes; png_uint_32 rb = row_info->rowbytes+4;
while (rb > 0) { while (rb > 4) {
b = load4(prev); b = load4(prev);
a = d; d = load4(row ); a = d; d = load4(row );
@ -242,7 +242,7 @@ void png_read_filter_row_paeth3_sse2(png_row_infop row_info, png_bytep row,
__m128i c, b = zero, __m128i c, b = zero,
a, d = zero; a, d = zero;
int rb = row_info->rowbytes; png_uint_32 rb = row_info->rowbytes;
while (rb >= 4) { while (rb >= 4) {
/* It's easiest to do this math (particularly, deal with pc) with 16-bit /* It's easiest to do this math (particularly, deal with pc) with 16-bit
* intermediates. * intermediates.
@ -336,8 +336,8 @@ void png_read_filter_row_paeth4_sse2(png_row_infop row_info, png_bytep row,
__m128i c, b = zero, __m128i c, b = zero,
a, d = zero; a, d = zero;
int rb = row_info->rowbytes; png_uint_32 rb = row_info->rowbytes+4;
while (rb > 0) { while (rb > 4) {
/* It's easiest to do this math (particularly, deal with pc) with 16-bit /* It's easiest to do this math (particularly, deal with pc) with 16-bit
* intermediates. * intermediates.
*/ */