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

Merge pull request #1240 from rouault/fix_crash_opj_decompress 

opj_decompress: add sanity checks to avoid segfault in case of decoding error
This commit is contained in:
Even Rouault 2020-04-01 22:00:19 +02:00 committed by GitHub
parent 563ecfb55c 1c54024165
commit 9c1cfb034a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/jp2/convert.c
View File

@ -2067,10 +2067,26 @@ int imagetopnm(opj_image_t * image, const char *outfile, int force_split)
has_alpha = (ncomp == 4 || ncomp == 2); has_alpha = (ncomp == 4 || ncomp == 2);
red = image->comps[0].data; red = image->comps[0].data;
if (red == NULL) {
fprintf(stderr,
"imagetopnm: planes[%d] == NULL.\n", 0);
fprintf(stderr, "\tAborting\n");
fclose(fdest);
return fails;
}
if (triple) { if (triple) {
green = image->comps[1].data; green = image->comps[1].data;
blue = image->comps[2].data; blue = image->comps[2].data;
for (i = 1; i <= 2; i++) {
if (image->comps[i].data == NULL) {
fprintf(stderr,
"imagetopnm: planes[%d] == NULL.\n", i);
fprintf(stderr, "\tAborting\n");
fclose(fdest);
return fails;
}
}
} else { } else {
green = blue = NULL; green = blue = NULL;
} }

12
src/bin/jp2/convertpng.c
View File

@ -297,6 +297,12 @@ int imagetopng(opj_image_t * image, const char *write_idf)
memset(&sig_bit, 0, sizeof(sig_bit)); memset(&sig_bit, 0, sizeof(sig_bit));
prec = (int)image->comps[0].prec; prec = (int)image->comps[0].prec;
planes[0] = image->comps[0].data; planes[0] = image->comps[0].data;
if (planes[0] == NULL) {
fprintf(stderr,
"imagetopng: planes[%d] == NULL.\n", 0);
fprintf(stderr, "\tAborting\n");
return 1;
}
nr_comp = (int)image->numcomps; nr_comp = (int)image->numcomps;
if (nr_comp > 4) { if (nr_comp > 4) {
@ -316,6 +322,12 @@ int imagetopng(opj_image_t * image, const char *write_idf)
break; break;
} }
planes[i] = image->comps[i].data; planes[i] = image->comps[i].data;
if (planes[i] == NULL) {
fprintf(stderr,
"imagetopng: planes[%d] == NULL.\n", i);
fprintf(stderr, "\tAborting\n");
return 1;
}
} }
if (i != nr_comp) { if (i != nr_comp) {
fprintf(stderr, fprintf(stderr,

6
src/bin/jp2/converttif.c
View File

@ -616,6 +616,12 @@ int imagetotif(opj_image_t * image, const char *outfile)
break; break;
} }
planes[i] = image->comps[i].data; planes[i] = image->comps[i].data;
if (planes[i] == NULL) {
fprintf(stderr,
"imagetotif: planes[%d] == NULL.\n", i);
fprintf(stderr, "\tAborting\n");
return 1;
}
} }
if (i != numcomps) { if (i != numcomps) {
fprintf(stderr, fprintf(stderr,