ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-05-30 16:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't read more memory than available in jpg decode

Browse source
This commit is contained in:
Ludwig Nussel 2008-02-14 11:13:42 +00:00
parent c77f537ae3
commit 7132b492dd
3 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
code/renderer/tr_image_jpg.c
View file

@ -56,6 +56,7 @@ void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height
unsigned row_stride; /* physical row width in output buffer */
unsigned pixelcount, memcount;
unsigned char *out;
int len;
byte *fbuffer;
byte *buf;
@ -65,8 +66,8 @@ void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height
* requires it in order to read binary files.
*/
ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
if (!fbuffer) {
len = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
if (!fbuffer || len < 0) {
return;
}
@ -84,7 +85,7 @@ void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height
/* Step 2: specify data source (eg, a file) */
jpeg_stdio_src(&cinfo, fbuffer);
jpeg_mem_src(&cinfo, fbuffer, len);
/* Step 3: read file parameters with jpeg_read_header() */