]> granicus.if.org Git - libjpeg-turbo/commitdiff
tjLoadImage(): Fix OOB array access w/TJPF_UNKNOWN
authorDRC <information@libjpeg-turbo.org>
Sun, 19 Nov 2017 15:18:36 +0000 (09:18 -0600)
committerDRC <information@libjpeg-turbo.org>
Sun, 19 Nov 2017 15:21:37 +0000 (09:21 -0600)
Because the previous commit added a test for TJPF_UNKNOWN to tjunittest,
the ASAN CI build detected this issue.

turbojpeg.c

index 771b9046fe6904547b4095615ca05fb0190ba3ca..41d0611411ff6078c1853834ac830f1cd9b7ec62 100644 (file)
@@ -1987,7 +1987,8 @@ DLLEXPORT unsigned char* DLLCALL tjLoadImage(const char *filename, int *width,
                retval=-1;  goto bailout;
        }
 
-       cinfo->in_color_space=pf2cs[*pixelFormat];
+       if(*pixelFormat==TJPF_UNKNOWN) cinfo->in_color_space=JCS_UNKNOWN;
+       else cinfo->in_color_space=pf2cs[*pixelFormat];
        if(tempc=='B')
        {
                if((src=jinit_read_bmp(cinfo, FALSE))==NULL)