CVE-2017-1000450

This commit is contained in:
Josef Ridky 2018-04-10 12:54:17 +02:00
parent 414f3350fd
commit 84e8dd5e80
2 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff -urNp old/modules/imgcodecs/src/grfmt_bmp.cpp new/modules/imgcodecs/src/grfmt_bmp.cpp
--- old/modules/imgcodecs/src/grfmt_bmp.cpp 2018-04-10 12:43:48.636921073 +0200
+++ new/modules/imgcodecs/src/grfmt_bmp.cpp 2018-04-10 12:49:30.394233343 +0200
@@ -368,6 +368,9 @@ decode_rle4_bad: ;
gray_palette[code] );
line_end_flag = y - prev_y;
+
+ if( y >= m_height )
+ break;
}
else if( code > 2 ) // absolute mode
{

View File

@ -66,6 +66,7 @@ Patch1: opencv-3.2.0-cmake_paths.patch
Patch2: opencv-3.1-pillow.patch Patch2: opencv-3.1-pillow.patch
Patch3: opencv-3.2.0-test-file-fix.patch Patch3: opencv-3.2.0-test-file-fix.patch
Patch4: opencv-CVE-2017-17760.patch Patch4: opencv-CVE-2017-17760.patch
Patch5: opencv-CVE-2017-1000450.patch
BuildRequires: libtool BuildRequires: libtool
BuildRequires: cmake >= 2.6.3 BuildRequires: cmake >= 2.6.3
@ -224,6 +225,8 @@ rm -rf modules/dnn/
popd popd
%patch4 -p1 -b .CVE-2017-17760 %patch4 -p1 -b .CVE-2017-17760
%patch5 -p1 -b .CVE-2017-1000450
# fix dos end of lines # fix dos end of lines
#sed -i 's|\r||g' samples/c/adaptiveskindetector.cpp #sed -i 's|\r||g' samples/c/adaptiveskindetector.cpp
@ -397,6 +400,7 @@ popd
%changelog %changelog
* Tue Apr 10 2018 Josef Ridky <jridky@redhat.com> - 3.2.0-15 * Tue Apr 10 2018 Josef Ridky <jridky@redhat.com> - 3.2.0-15
- Fix for CVE-2017-17760 (#1530748) - Fix for CVE-2017-17760 (#1530748)
- Fix for CVE-2017-1000450 (#1531611)
* Sun Jan 28 2018 Sérgio Basto <sergio@serjux.com> - 3.2.0-14 * Sun Jan 28 2018 Sérgio Basto <sergio@serjux.com> - 3.2.0-14
- Rebuilt (#1533660) - Rebuilt (#1533660)