commit b6576319531237694725a7b547b9730286591223
author DRC <information@libjpeg-turbo.org> Wed Aug 26 20:31:13 2015 -0500
committer DRC <information@libjpeg-turbo.org> Wed Aug 26 20:31:13 2015 -0500
tree 3dfd4b4046cff3f0d25875c19ccf19dd7c73d33a
parent 333f3cf7565d588b483a3ac82193bd8ba0a93bec
parent 58ae401e503ac61babb9d66be8fc06bfb0445dbf

Merge branch '1.4.x'

turbojpeg.c

diff --git a/turbojpeg.c b/turbojpeg.c
index cd9bfd7..5754cb1 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -1386,7 +1386,7 @@
 		if(scaledw<=width && scaledh<=height)
 			break;
 	}
-	if(scaledw>width || scaledh>height)
+	if(i>=NUMSF)
 		_throw("tjDecompress2(): Could not scale down to desired image dimensions");
 	width=scaledw;  height=scaledh;
 	dinfo->scale_num=sf[i].num;
@@ -1762,7 +1762,7 @@
 		if(scaledw<=width && scaledh<=height)
 			break;
 	}
-	if(scaledw>width || scaledh>height)
+	if(i>=NUMSF)
 		_throw("tjDecompressToYUVPlanes(): Could not scale down to desired image dimensions");
 	if(dinfo->num_components>3)
 		_throw("tjDecompressToYUVPlanes(): JPEG image must have 3 or fewer components");
@@ -1908,7 +1908,7 @@
 		if(scaledw<=width && scaledh<=height)
 			break;
 	}
-	if(scaledw>width || scaledh>height)
+	if(i>=NUMSF)
 		_throw("tjDecompressToYUV2(): Could not scale down to desired image dimensions");
 
 	pw0=tjPlaneWidth(0, width, jpegSubsamp);