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

[trunk] fixed a bug triggering SEGFAULT on debug mode (uninitialized 

structure)
This commit is contained in:
Antonin Descampe 2014-04-02 16:25:40 +00:00
parent 616a3345c4
commit 4db4198722
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -587,7 +587,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
substr1 = (char*) malloc((len+1)*sizeof(char)); substr1 = (char*) malloc((len+1)*sizeof(char));
memcpy(substr1,opj_optarg,len); memcpy(substr1,opj_optarg,len);
substr1[len] = '\0'; substr1[len] = '\0';
if (sscanf(substr1, "%d,%d,%d,%d,%[su]", &width, &height, &ncomp, &bitdepth, &signo) == 5) { if (sscanf(substr1, "%d,%d,%d,%d,%c", &width, &height, &ncomp, &bitdepth, &signo) == 5) {
if (signo == 's') { if (signo == 's') {
raw_signed = OPJ_TRUE; raw_signed = OPJ_TRUE;
} else if (signo == 'u') { } else if (signo == 'u') {
@ -636,6 +636,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
} }
} }
} }
if (substr1) free(substr1);
if (wrong) { if (wrong) {
fprintf(stderr,"\nError: invalid raw image parameters\n"); fprintf(stderr,"\nError: invalid raw image parameters\n");
fprintf(stderr,"Please use the Format option -F:\n"); fprintf(stderr,"Please use the Format option -F:\n");
@ -646,7 +647,6 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
fprintf(stderr,"Aborting.\n"); fprintf(stderr,"Aborting.\n");
return 1; return 1;
} }
if (substr1 != NULL) free(substr1);
} }
break; break;
@ -1526,6 +1526,14 @@ int main(int argc, char **argv) {
*indexfilename = 0; *indexfilename = 0;
memset(&img_fol,0,sizeof(img_fol_t)); memset(&img_fol,0,sizeof(img_fol_t));
/* raw_cp initialization */
raw_cp.rawBitDepth = 0;
raw_cp.rawComp = 0;
raw_cp.rawComps = 0;
raw_cp.rawHeight = 0;
raw_cp.rawSigned = 0;
raw_cp.rawWidth = 0;
/* parse input and get user encoding parameters */ /* parse input and get user encoding parameters */
parameters.tcp_mct = (char) 255; /* This will be set later according to the input image or the provided option */ parameters.tcp_mct = (char) 255; /* This will be set later according to the input image or the provided option */
if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol, &raw_cp, indexfilename) == 1) { if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol, &raw_cp, indexfilename) == 1) {