luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add warning or workaround for libjpeg-turbo

Browse source
This commit is contained in:
Christophe Grenier 2011-04-03 18:13:37 +02:00
parent 785602ec29
commit 5b6c527665
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/file_jpg.c
View file

@ -928,8 +928,9 @@ static void jpg_check_picture(file_recovery_t *file_recovery)
} }
else else
{ {
jpeg_session.frame = (unsigned char *)MALLOC(jpeg_session.output_height * jpeg_session.row_stride); /* FIXME out of bound read access in libjpeg-turbo */
memset(jpeg_session.frame, 0x80, jpeg_session.row_stride * jpeg_session.cinfo.output_height); jpeg_session.frame = (unsigned char *)MALLOC((jpeg_session.output_height+1) * jpeg_session.row_stride);
memset(jpeg_session.frame, 0x80, (jpeg_session.cinfo.output_height+1) * jpeg_session.row_stride);
} }
while (jpeg_session.cinfo.output_scanline < jpeg_session.cinfo.output_height) while (jpeg_session.cinfo.output_scanline < jpeg_session.cinfo.output_height)
{ {

1
src/suspend.c
View file

@ -2,6 +2,7 @@
File: suspend.c File: suspend.c
A suspending/resuming memory manager for libjpeg A suspending/resuming memory manager for libjpeg
NOT COMPATIBLE WITH libjpeg-turbo
Copyright (C) 2009 Christophe GRENIER <grenier@cgsecurity.org> Copyright (C) 2009 Christophe GRENIER <grenier@cgsecurity.org>
Copyright (C) 2008 Michael Cohen <scudette@users.sourceforge.net>, part of pyflag Copyright (C) 2008 Michael Cohen <scudette@users.sourceforge.net>, part of pyflag