Use of OPJ_PATH_LEN (defined as 4096) to be the maximum allowed size for filenames instead of MAX_PATH which is not always defined. This caused some programs using OpenJPEG to crash. Modifications in openjpeg.h j2k_to_image.c and image_to_j2k.c

This commit is contained in:
Francois-Olivier Devaux
2007-01-30 10:51:29 +00:00
parent d48feb45fc
commit a6d7377213
4 changed files with 16 additions and 14 deletions

View File

@@ -332,7 +332,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
infile);
return 1;
}
strncpy(parameters->infile, infile, MAX_PATH);
strncpy(parameters->infile, infile, OPJ_PATH_LEN);
}
break;
@@ -350,7 +350,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
return 1;
}
strncpy(parameters->outfile, outfile, MAX_PATH);
strncpy(parameters->outfile, outfile, OPJ_PATH_LEN);
}
break;
@@ -498,7 +498,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
case 'x': /* creation of index file */
{
char *index = optarg;
strncpy(parameters->index, index, MAX_PATH);
strncpy(parameters->index, index, OPJ_PATH_LEN);
parameters->index_on = 1;
}
break;
@@ -668,7 +668,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
/* we need to enable indexing */
if (!parameters->index_on) {
strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, MAX_PATH);
strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN);
parameters->index_on = 1;
}