Skip to content

Fix buffer overflows in jp2/jpwl compress/decompress #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix buffer overflows in jp2/jpwl compress/decompress #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b54ae7
Fix buffer overflows in jp2/jpwl compress/decompress
Aug 3, 2018
798ea0c
Fix indentation with astyle
Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/bin/jp2/opj_compress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,13 @@ static int parse_cmdline_encoder(int argc, char **argv,
case 'O': { /* output format */
char outformat[50];
char *of = opj_optarg;
sprintf(outformat, ".%s", of);
img_fol->set_out_format = 1;
parameters->cod_format = get_file_format(outformat);
if (strlen(opj_optarg) < sizeof(outformat)) {
sprintf(outformat, ".%s", of);
img_fol->set_out_format = 1;
parameters->cod_format = get_file_format(outformat);
} else {
parameters->cod_format = -1;
}
switch (parameters->cod_format) {
case J2K_CFMT:
case JP2_CFMT:
Expand Down
10 changes: 7 additions & 3 deletions src/bin/jp2/opj_decompress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,9 +662,13 @@ int parse_cmdline_decoder(int argc, char **argv,
case 'O': { /* output format */
char outformat[50];
char *of = opj_optarg;
sprintf(outformat, ".%s", of);
img_fol->set_out_format = 1;
parameters->cod_format = get_file_format(outformat);
if (strlen(opj_optarg) < sizeof(outformat)) {
sprintf(outformat, ".%s", of);
img_fol->set_out_format = 1;
parameters->cod_format = get_file_format(outformat);
} else {
parameters->cod_format = -1;
}
switch (parameters->cod_format) {
case PGX_DFMT:
img_fol->out_format = "pgx";
Expand Down
10 changes: 7 additions & 3 deletions src/bin/jpwl/opj_jpwl_compress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,13 @@ static int parse_cmdline_encoder(int argc, char **argv,
case 'O': { /* output format */
char outformat[50];
char *of = opj_optarg;
sprintf(outformat, ".%s", of);
img_fol->set_out_format = 1;
parameters->cod_format = get_file_format(outformat);
if (strlen(opj_optarg) < sizeof(outformat)) {
sprintf(outformat, ".%s", of);
img_fol->set_out_format = 1;
parameters->cod_format = get_file_format(outformat);
} else {
parameters->cod_format = -1;
}
switch (parameters->cod_format) {
case J2K_CFMT:
case JP2_CFMT:
Expand Down
10 changes: 7 additions & 3 deletions src/bin/jpwl/opj_jpwl_decompress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,13 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,
case 'O': { /* output format */
char outformat[50];
char *of = opj_optarg;
sprintf(outformat, ".%s", of);
img_fol->set_out_format = 1;
parameters->cod_format = get_file_format(outformat);
if (strlen(opj_optarg) < sizeof(outformat)) {
sprintf(outformat, ".%s", of);
img_fol->set_out_format = 1;
parameters->cod_format = get_file_format(outformat);
} else {
parameters->cod_format = -1;
}
switch (parameters->cod_format) {
case PGX_DFMT:
img_fol->out_format = "pgx";
Expand Down