* tools/rgb2ycbcr.c: validate values of -v and -h parameters to

avoid potential divide by zero. Fixes CVE-2016-3623 (bugzilla #2569)
vadz · Aug 15, 2016 · bd024f0 · bd024f0
1 parent e596d4e
commit bd024f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-15 Even Rouault <even.rouault at spatialys.com>
+
+	* tools/rgb2ycbcr.c: validate values of -v and -h parameters to
+	avoid potential divide by zero. Fixes CVE-2016-3623 (bugzilla #2569)
+
 2016-08-15 Even Rouault <even.rouault at spatialys.com>
 
 	* tools/tiffcrop.c: Fix out-of-bounds write in loadImage().

diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c
@@ -95,9 +95,13 @@ main(int argc, char* argv[])
 			break;
 		case 'h':
 			horizSubSampling = atoi(optarg);
+            if( horizSubSampling != 1 && horizSubSampling != 2 && horizSubSampling != 4 )
+                usage(-1);
 			break;
 		case 'v':
 			vertSubSampling = atoi(optarg);
+            if( vertSubSampling != 1 && vertSubSampling != 2 && vertSubSampling != 4 )
+                usage(-1);
 			break;
 		case 'r':
 			rowsperstrip = atoi(optarg);