ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Another oops. tjBufSizeYUV2() should return -1 if width < 1.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1409 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2014-10-23 19:07:25 +00:00
parent 1083a3bffb
commit 338ac421d7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -7,9 +7,12 @@ 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 [2] The non-SIMD RGB565 color conversion code did not work correctly on big
endian machines. This has been fixed. endian machines. This has been fixed.
[3] Fixed an issue in tjPlaneSizeYUV() whereby it was erroneously returning 1 [3] Fixed an issue in tjPlaneSizeYUV() whereby it would erroneously return 1
instead of -1 if componentID was > 0 and subsamp was TJSAMP_GRAY. instead of -1 if componentID was > 0 and subsamp was TJSAMP_GRAY.
[3] Fixed an issue in tjBufSizeYUV2() wherby it would erroneously return 0
instead of -1 if width was < 1.
1.3.90 (1.4 beta1) 1.3.90 (1.4 beta1)
================== ==================

5
turbojpeg.c
View File

@@ -613,9 +613,10 @@ DLLEXPORT unsigned long DLLCALL tjBufSizeYUV2(int width, int pad, int height,
nc=(subsamp==TJSAMP_GRAY? 1:3); nc=(subsamp==TJSAMP_GRAY? 1:3);
for(i=0; i<nc; i++) for(i=0; i<nc; i++)
{ {
int stride=PAD(tjPlaneWidth(i, width, subsamp), pad); int pw=tjPlaneWidth(i, width, subsamp);
int stride=PAD(pw, pad);
int ph=tjPlaneHeight(i, height, subsamp); int ph=tjPlaneHeight(i, height, subsamp);
if(stride<0 || ph<0) return -1; if(pw<0 || ph<0) return -1;
else retval+=stride*ph; else retval+=stride*ph;
} }