walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "[JPWL] tgatoimage(): avoid excessive memory allocation attempt," 

This reverts commit 05be308446.

This commit doesn't compile due to missing OPJ_UINT64 type
This commit is contained in:
Even Rouault 2019-03-29 10:44:35 +01:00
parent e1740e7ce7
commit 25b815dc46
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/bin/jpwl/convert.c
View File

@ -99,10 +99,15 @@ struct tga_header {
}; };
#endif /* INFORMATION_ONLY */ #endif /* INFORMATION_ONLY */
/* Returns a ushort from a little-endian serialized value */ static unsigned short get_ushort(unsigned short val)
static unsigned short get_tga_ushort(const unsigned char *data)
{ {
return data[0] | (data[1] << 8);
#ifdef OPJ_BIG_ENDIAN
return (((val & 0xff) << 8) + (val >> 8));
#else
return (val);
#endif
} }
#define TGA_HEADER_SIZE 18 #define TGA_HEADER_SIZE 18
@ -131,15 +136,15 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel,
id_len = (unsigned char)tga[0]; id_len = (unsigned char)tga[0];
cmap_type = (unsigned char)tga[1]; cmap_type = (unsigned char)tga[1];
image_type = (unsigned char)tga[2]; image_type = (unsigned char)tga[2];
cmap_index = get_tga_ushort(*(unsigned short*)(&tga[3])); cmap_index = get_ushort(*(unsigned short*)(&tga[3]));
cmap_len = get_tga_ushort(*(unsigned short*)(&tga[5])); cmap_len = get_ushort(*(unsigned short*)(&tga[5]));
cmap_entry_size = (unsigned char)tga[7]; cmap_entry_size = (unsigned char)tga[7];
x_origin = get_tga_ushort(*(unsigned short*)(&tga[8])); x_origin = get_ushort(*(unsigned short*)(&tga[8]));
y_origin = get_tga_ushort(*(unsigned short*)(&tga[10])); y_origin = get_ushort(*(unsigned short*)(&tga[10]));
image_w = get_tga_ushort(*(unsigned short*)(&tga[12])); image_w = get_ushort(*(unsigned short*)(&tga[12]));
image_h = get_tga_ushort(*(unsigned short*)(&tga[14])); image_h = get_ushort(*(unsigned short*)(&tga[14]));
pixel_depth = (unsigned char)tga[16]; pixel_depth = (unsigned char)tga[16];
image_desc = (unsigned char)tga[17]; image_desc = (unsigned char)tga[17];
@ -329,24 +334,6 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters)
color_space = CLRSPC_SRGB; color_space = CLRSPC_SRGB;
} }
/* If the declared file size is > 10 MB, check that the file is big */
/* enough to avoid excessive memory allocations */
if (image_height != 0 && image_width > 10000000 / image_height / numcomps) {
char ch;
OPJ_UINT64 expected_file_size =
(OPJ_UINT64)image_width * image_height * numcomps;
long curpos = ftell(f);
if (expected_file_size > (OPJ_UINT64)INT_MAX) {
expected_file_size = (OPJ_UINT64)INT_MAX;
}
fseek(f, (long)expected_file_size - 1, SEEK_SET);
if (fread(&ch, 1, 1, f) != 1) {
fclose(f);
return NULL;
}
fseek(f, curpos, SEEK_SET);
}
subsampling_dx = parameters->subsampling_dx; subsampling_dx = parameters->subsampling_dx;
subsampling_dy = parameters->subsampling_dy; subsampling_dy = parameters->subsampling_dy;