From: DRC <dcommander@users.sourceforge.net>
Date: Thu, 23 Oct 2014 18:54:42 +0000 (+0000)
Subject: Oops.  tjPlaneSizeYUV() should return -1 if componentID > 0 and subsamp==TJSAMP_GRAY.
X-Git-Tag: 1.4.0~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2240974d5dc23a27ceb513af3cfc18f7298af0dc;p=libjpeg-turbo

Oops.  tjPlaneSizeYUV() should return -1 if componentID > 0 and subsamp==TJSAMP_GRAY.


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.4.x@1408 632fc199-4ca6-4c93-a231-07263d6284db
---

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e68bf99..f95d6fe 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,9 @@ because OS X does not provide the le32toh() and htole32() functions.)
 [2] The non-SIMD RGB565 color conversion code did not work correctly on big
 endian machines.  This has been fixed.
 
+[3] Fixed an issue in tjPlaneSizeYUV() whereby it was erroneously returning 1
+instead of -1 if componentID was > 0 and subsamp was TJSAMP_GRAY.
+
 
 1.3.90 (1.4 beta1)
 ==================
diff --git a/turbojpeg.c b/turbojpeg.c
index 1acf7c4..a5ca319 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -689,6 +689,7 @@ DLLEXPORT unsigned long DLLCALL tjPlaneSizeYUV(int componentID, int width,
 
 	pw=tjPlaneWidth(componentID, width, subsamp);
 	ph=tjPlaneHeight(componentID, height, subsamp);
+	if(pw<0 || ph<0) return -1;
 
 	if(stride==0) stride=pw;
 	else stride=abs(stride);