From 319fc971fef8a1e1c1c543506c26805873e3f258 Mon Sep 17 00:00:00 2001 From: julienmalik Date: Fri, 29 Apr 2016 23:49:17 +0200 Subject: [PATCH] cppcheck fix for openjp2 (#740) --- src/bin/common/color.c | 208 ++++++++++++++++++++++++++++----- src/bin/jp2/convert.c | 11 +- src/bin/jp2/convertbmp.c | 8 +- src/bin/jp2/convertpng.c | 14 ++- src/bin/jp2/opj_compress.c | 29 ++++- src/bin/jp2/opj_decompress.c | 75 ++++++------ src/bin/jp2/opj_dump.c | 55 ++++++--- src/lib/openjp2/cidx_manager.c | 4 +- src/lib/openjp2/j2k.c | 9 +- src/lib/openjp2/jp2.c | 10 +- src/lib/openjp2/phix_manager.c | 4 +- src/lib/openjp2/ppix_manager.c | 4 +- src/lib/openjp2/t1.c | 6 +- src/lib/openjp2/thix_manager.c | 4 +- tests/test_tile_encoder.c | 11 +- 15 files changed, 345 insertions(+), 107 deletions(-) diff --git a/src/bin/common/color.c b/src/bin/common/color.c index 0f2b8dac..cd4fafdd 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -108,6 +108,8 @@ static void sycc444_to_rgb(opj_image_t *img) d1 = g = (int*)malloc(sizeof(int) * (size_t)max); d2 = b = (int*)malloc(sizeof(int) * (size_t)max); + if(r == NULL || g == NULL || b == NULL) goto fails; + for(i = 0U; i < max; ++i) { sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b); @@ -116,6 +118,12 @@ static void sycc444_to_rgb(opj_image_t *img) free(img->comps[0].data); img->comps[0].data = d0; free(img->comps[1].data); img->comps[1].data = d1; free(img->comps[2].data); img->comps[2].data = d2; + return; + +fails: + if(r) free(r); + if(g) free(g); + if(b) free(b); }/* sycc444_to_rgb() */ @@ -141,6 +149,8 @@ static void sycc422_to_rgb(opj_image_t *img) d1 = g = (int*)malloc(sizeof(int) * (size_t)max); d2 = b = (int*)malloc(sizeof(int) * (size_t)max); + if(r == NULL || g == NULL || b == NULL) goto fails; + for(i=0U; i < maxh; ++i) { for(j=0U; j < (maxw & ~(unsigned int)1U); j += 2U) @@ -170,6 +180,12 @@ static void sycc422_to_rgb(opj_image_t *img) img->comps[2].dx = img->comps[0].dx; img->comps[1].dy = img->comps[0].dy; img->comps[2].dy = img->comps[0].dy; + return; + +fails: + if(r) free(r); + if(g) free(g); + if(b) free(b); }/* sycc422_to_rgb() */ @@ -195,6 +211,8 @@ static void sycc420_to_rgb(opj_image_t *img) d1 = g = (int*)malloc(sizeof(int) * (size_t)max); d2 = b = (int*)malloc(sizeof(int) * (size_t)max); + if(r == NULL || g == NULL || b == NULL) goto fails; + for(i=0U; i < (maxh & ~(unsigned int)1U); i += 2U) { ny = y + maxw; @@ -255,6 +273,12 @@ static void sycc420_to_rgb(opj_image_t *img) img->comps[2].dx = img->comps[0].dx; img->comps[1].dy = img->comps[0].dy; img->comps[2].dy = img->comps[0].dy; + return; + +fails: + if(r) free(r); + if(g) free(g); + if(b) free(b); }/* sycc420_to_rgb() */ @@ -328,10 +352,11 @@ void color_apply_icc_profile(opj_image_t *image) cmsHPROFILE in_prof, out_prof; cmsHTRANSFORM transform; cmsColorSpaceSignature in_space, out_space; - cmsUInt32Number intent, in_type, out_type, nr_samples; + cmsUInt32Number intent, in_type, out_type; int *r, *g, *b; - int prec, i, max, max_w, max_h; - OPJ_COLOR_SPACE oldspace; + size_t nr_samples; + int prec, i, max, max_w, max_h, ok = 0; + OPJ_COLOR_SPACE new_space; in_prof = cmsOpenProfileFromMem(image->icc_profile_buf, image->icc_profile_len); @@ -351,7 +376,6 @@ void color_apply_icc_profile(opj_image_t *image) max_w = (int)image->comps[0].w; max_h = (int)image->comps[0].h; prec = (int)image->comps[0].prec; - oldspace = image->color_space; if(out_space == cmsSigRgbData) /* enumCS 16 */ { @@ -366,7 +390,7 @@ void color_apply_icc_profile(opj_image_t *image) out_type = TYPE_RGB_16; } out_prof = cmsCreate_sRGBProfile(); - image->color_space = OPJ_CLRSPC_SRGB; + new_space = OPJ_CLRSPC_SRGB; } else if(out_space == cmsSigGrayData) /* enumCS 17 */ @@ -374,7 +398,7 @@ void color_apply_icc_profile(opj_image_t *image) in_type = TYPE_GRAY_8; out_type = TYPE_RGB_8; out_prof = cmsCreate_sRGBProfile(); - image->color_space = OPJ_CLRSPC_SRGB; + new_space = OPJ_CLRSPC_SRGB; } else if(out_space == cmsSigYCbCrData) /* enumCS 18 */ @@ -382,7 +406,7 @@ void color_apply_icc_profile(opj_image_t *image) in_type = TYPE_YCbCr_16; out_type = TYPE_RGB_16; out_prof = cmsCreate_sRGBProfile(); - image->color_space = OPJ_CLRSPC_SRGB; + new_space = OPJ_CLRSPC_SRGB; } else { @@ -393,6 +417,14 @@ __FILE__,__LINE__,out_space, (out_space>>24) & 0xff,(out_space>>16) & 0xff, (out_space>>8) & 0xff, out_space & 0xff); #endif + cmsCloseProfile(in_prof); + + return; + } + if(out_prof == NULL) + { + cmsCloseProfile(in_prof); + return; } @@ -435,7 +467,7 @@ fprintf(stderr,"\trender_intent (%u)\n\t" fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. " "ICC Profile ignored.\n",__FILE__,__LINE__); #endif - image->color_space = oldspace; + #ifdef OPJ_HAVE_LIBLCMS1 cmsCloseProfile(in_prof); cmsCloseProfile(out_prof); @@ -448,11 +480,14 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. " if( prec <= 8 ) { unsigned char *inbuf, *outbuf, *in, *out; + max = max_w * max_h; - nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned char); + nr_samples = (size_t)(max * 3 * sizeof(unsigned char)); in = inbuf = (unsigned char*)malloc(nr_samples); out = outbuf = (unsigned char*)malloc(nr_samples); + if(inbuf == NULL || outbuf == NULL) goto fails0; + r = image->comps[0].data; g = image->comps[1].data; b = image->comps[2].data; @@ -476,16 +511,23 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. " *g++ = (int)*out++; *b++ = (int)*out++; } - free(inbuf); free(outbuf); + ok = 1; + +fails0: + if(inbuf) free(inbuf); + if(outbuf) free(outbuf); } - else + else /* prec > 8 */ { unsigned short *inbuf, *outbuf, *in, *out; + max = max_w * max_h; - nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned short); + nr_samples = (size_t)(max * 3 * sizeof(unsigned short)); in = inbuf = (unsigned short*)malloc(nr_samples); out = outbuf = (unsigned short*)malloc(nr_samples); + if(inbuf == NULL || outbuf == NULL) goto fails1; + r = image->comps[0].data; g = image->comps[1].data; b = image->comps[2].data; @@ -509,37 +551,53 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. " *g++ = (int)*out++; *b++ = (int)*out++; } - free(inbuf); free(outbuf); + ok = 1; + +fails1: + if(inbuf) free(inbuf); + if(outbuf) free(outbuf); } } - else /* GRAY, GRAYA */ + else /* image->numcomps <= 2 : GRAY, GRAYA */ { + if(prec <= 8) + { unsigned char *in, *inbuf, *out, *outbuf; + opj_image_comp_t *new_comps; + max = max_w * max_h; - nr_samples = (cmsUInt32Number)max * 3 * sizeof(unsigned char); + nr_samples = (size_t)(max * 3 * sizeof(unsigned char)); in = inbuf = (unsigned char*)malloc(nr_samples); out = outbuf = (unsigned char*)malloc(nr_samples); + g = (int*)calloc((size_t)max, sizeof(int)); + b = (int*)calloc((size_t)max, sizeof(int)); - image->comps = (opj_image_comp_t*) + if(inbuf == NULL || outbuf == NULL || g == NULL || b == NULL) goto fails2; + + new_comps = (opj_image_comp_t*) realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t)); + if(new_comps == NULL) goto fails2; + + image->comps = new_comps; + if(image->numcomps == 2) image->comps[3] = image->comps[1]; image->comps[1] = image->comps[0]; image->comps[2] = image->comps[0]; - image->comps[1].data = (int*)calloc((size_t)max, sizeof(int)); - image->comps[2].data = (int*)calloc((size_t)max, sizeof(int)); + image->comps[1].data = g; + image->comps[2].data = b; image->numcomps += 2; r = image->comps[0].data; for(i = 0; i < max; ++i) - { + { *in++ = (unsigned char)*r++; - } + } cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max); r = image->comps[0].data; @@ -547,12 +605,76 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. " b = image->comps[2].data; for(i = 0; i < max; ++i) - { + { *r++ = (int)*out++; *g++ = (int)*out++; *b++ = (int)*out++; - } - free(inbuf); free(outbuf); + } + r = g = b = NULL; + ok = 1; - }/* if(image->numcomps */ +fails2: + if(inbuf) free(inbuf); + if(outbuf) free(outbuf); + if(g) free(g); + if(b) free(b); + } + else /* prec > 8 */ + { + unsigned short *in, *inbuf, *out, *outbuf; + opj_image_comp_t *new_comps; + + max = max_w * max_h; + nr_samples = (size_t)(max * 3 * sizeof(unsigned short)); + in = inbuf = (unsigned short*)malloc(nr_samples); + out = outbuf = (unsigned short*)malloc(nr_samples); + g = (int*)calloc((size_t)max, sizeof(int)); + b = (int*)calloc((size_t)max, sizeof(int)); + + if(inbuf == NULL || outbuf == NULL || g == NULL || b == NULL) goto fails3; + + new_comps = (opj_image_comp_t*) + realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t)); + + if(new_comps == NULL) goto fails3; + + image->comps = new_comps; + + if(image->numcomps == 2) + image->comps[3] = image->comps[1]; + + image->comps[1] = image->comps[0]; + image->comps[2] = image->comps[0]; + + image->comps[1].data = g; + image->comps[2].data = b; + + image->numcomps += 2; + + r = image->comps[0].data; + + for(i = 0; i < max; ++i) + { + *in++ = (unsigned short)*r++; + } + cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max); + + r = image->comps[0].data; + g = image->comps[1].data; + b = image->comps[2].data; + + for(i = 0; i < max; ++i) + { + *r++ = (int)*out++; *g++ = (int)*out++; *b++ = (int)*out++; + } + r = g = b = NULL; + ok = 1; + +fails3: + if(inbuf) free(inbuf); + if(outbuf) free(outbuf); + if(g) free(g); + if(b) free(b); + } + }/* if(image->numcomps > 2) */ cmsDeleteTransform(transform); @@ -560,15 +682,18 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. " cmsCloseProfile(in_prof); cmsCloseProfile(out_prof); #endif + if(ok) + { + image->color_space = new_space; + } }/* color_apply_icc_profile() */ void color_cielab_to_rgb(opj_image_t *image) { int *row; int enumcs, numcomps; - - image->color_space = OPJ_CLRSPC_SRGB; - + OPJ_COLOR_SPACE new_space; + numcomps = (int)image->numcomps; if(numcomps != 3) @@ -595,8 +720,14 @@ void color_cielab_to_rgb(opj_image_t *image) cmsCIELab Lab; in = cmsCreateLab4Profile(NULL); + if(in == NULL){ + return; + } out = cmsCreate_sRGBProfile(); - + if(out == NULL){ + cmsCloseProfile(in); + return; + } transform = cmsCreateTransform(in, TYPE_Lab_DBL, out, TYPE_RGB_16, INTENT_PERCEPTUAL, 0); #ifdef OPJ_HAVE_LIBLCMS2 @@ -611,6 +742,8 @@ void color_cielab_to_rgb(opj_image_t *image) #endif return; } + new_space = OPJ_CLRSPC_SRGB; + prec0 = (double)image->comps[0].prec; prec1 = (double)image->comps[1].prec; prec2 = (double)image->comps[2].prec; @@ -639,7 +772,9 @@ void color_cielab_to_rgb(opj_image_t *image) red = dst0 = (int*)malloc(max * sizeof(int)); green = dst1 = (int*)malloc(max * sizeof(int)); blue = dst2 = (int*)malloc(max * sizeof(int)); - + + if(red == NULL || green == NULL || blue == NULL) goto fails; + minL = -(rl * ol)/(pow(2, prec0)-1); maxL = minL + rl; @@ -670,16 +805,27 @@ void color_cielab_to_rgb(opj_image_t *image) free(src1); image->comps[1].data = dst1; free(src2); image->comps[2].data = dst2; - image->color_space = OPJ_CLRSPC_SRGB; + image->color_space = new_space; image->comps[0].prec = 16; image->comps[1].prec = 16; image->comps[2].prec = 16; return; + +fails: + cmsDeleteTransform(transform); +#ifdef OPJ_HAVE_LIBLCMS1 + cmsCloseProfile(in); + cmsCloseProfile(out); +#endif + if(red) free(red); + if(green) free(green); + if(blue) free(blue); + return; } fprintf(stderr,"%s:%d:\n\tenumCS %d not handled. Ignoring.\n", __FILE__,__LINE__, enumcs); -}/* color_apply_conversion() */ +}/* color_cielab_to_rgb() */ #endif /* OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1 */ diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index 13713204..940ac2fa 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -611,6 +611,10 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, if (id_len) { unsigned char *id = (unsigned char *) malloc(id_len); + if(id == 0){ + fprintf(stderr, "tga_readheader: memory out\n"); + return 0; + } if ( !fread(id, id_len, 1, fp) ) { fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); @@ -1249,6 +1253,7 @@ int imagetopgx(opj_image_t * image, const char *outfile) { name = (char*)malloc(total+1); if (name == NULL) { + fprintf(stderr, "imagetopgx: memory out\n"); goto fin; } } @@ -1906,7 +1911,11 @@ if(v > 65535) v = 65535; else if(v < 0) v = 0; fprintf(stderr," is written to the file\n"); } destname = (char*)malloc(strlen(outfile) + 8); - + if(destname == NULL){ + fprintf(stderr, "imagetopnm: memory out\n"); + fclose(fdest); + return 1; + } for (compno = 0; compno < ncomp; compno++) { if (ncomp > 1) diff --git a/src/bin/jp2/convertbmp.c b/src/bin/jp2/convertbmp.c index 910574b8..a09c0ae5 100644 --- a/src/bin/jp2/convertbmp.c +++ b/src/bin/jp2/convertbmp.c @@ -181,7 +181,7 @@ static void bmpmask32toimage(const OPJ_UINT8* pData, OPJ_UINT32 stride, opj_imag OPJ_UINT32 width, height; OPJ_UINT32 x, y; const OPJ_UINT8 *pSrc = NULL; - OPJ_BOOL hasAlpha = OPJ_FALSE; + OPJ_BOOL hasAlpha; OPJ_UINT32 redShift, redPrec; OPJ_UINT32 greenShift, greenPrec; OPJ_UINT32 blueShift, bluePrec; @@ -239,7 +239,7 @@ static void bmpmask16toimage(const OPJ_UINT8* pData, OPJ_UINT32 stride, opj_imag OPJ_UINT32 width, height; OPJ_UINT32 x, y; const OPJ_UINT8 *pSrc = NULL; - OPJ_BOOL hasAlpha = OPJ_FALSE; + OPJ_BOOL hasAlpha; OPJ_UINT32 redShift, redPrec; OPJ_UINT32 greenShift, greenPrec; OPJ_UINT32 blueShift, bluePrec; @@ -891,7 +891,7 @@ int imagetobmp(opj_image_t * image, const char *outfile) { fprintf(fdest, "%c%c%c", bc, gc, rc); if ((i + 1) % w == 0) { - for (pad = (3 * w) % 4 ? 4 - (3 * w) % 4 : 0; pad > 0; pad--) /* ADD */ + for (pad = ((3 * w) % 4) ? (4 - (3 * w) % 4) : 0; pad > 0; pad--) /* ADD */ fprintf(fdest, "%c", 0); } } @@ -967,7 +967,7 @@ int imagetobmp(opj_image_t * image, const char *outfile) { fprintf(fdest, "%c", (OPJ_UINT8)r); if ((i + 1) % w == 0) { - for (pad = w % 4 ? 4 - w % 4 : 0; pad > 0; pad--) /* ADD */ + for ((pad = w % 4) ? (4 - w % 4) : 0; pad > 0; pad--) /* ADD */ fprintf(fdest, "%c", 0); } } diff --git a/src/bin/jp2/convertpng.c b/src/bin/jp2/convertpng.c index 8d117412..5635c7d0 100644 --- a/src/bin/jp2/convertpng.c +++ b/src/bin/jp2/convertpng.c @@ -185,9 +185,17 @@ opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params) rows = (OPJ_BYTE**)calloc(height+1, sizeof(OPJ_BYTE*)); - for(i = 0; i < height; ++i) + if(rows == NULL){ + fprintf(stderr, "pngtoimage: memory out\n"); + goto fin; + } + for(i = 0; i < height; ++i){ rows[i] = (OPJ_BYTE*)malloc(png_get_rowbytes(png,info)); - + if(rows[i] == NULL){ + fprintf(stderr,"pngtoimage: memory out\n"); + goto fin; + } + } png_read_image(png, rows); /* Create image */ @@ -235,7 +243,7 @@ fin: if(rows) { for(i = 0; i < height; ++i) - free(rows[i]); + if(rows[i]) free(rows[i]); free(rows); } if (row32s) { diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c index 9d690a56..5a63a9d6 100644 --- a/src/bin/jp2/opj_compress.c +++ b/src/bin/jp2/opj_compress.c @@ -647,6 +647,10 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param raw_cp->rawBitDepth = bitdepth; raw_cp->rawSigned = raw_signed; raw_cp->rawComps = (raw_comp_cparameters_t*) malloc(((OPJ_UINT32)(ncomp))*sizeof(raw_comp_cparameters_t)); + if(raw_cp->rawComps == NULL){ + free(substr1); + return 1; + } for (compno = 0; compno < ncomp && !wrong; compno++) { if (substr2 == NULL) { raw_cp->rawComps[compno].dx = lastdx; @@ -725,6 +729,9 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param numresolution = (OPJ_UINT32)parameters->numresolution; matrix_width = numresolution * 3; parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int)); + if(parameters->cp_matrice == NULL){ + return 1; + } s = s + 2; for (i = 0; i < numlayers; i++) { @@ -995,6 +1002,9 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param case 'z': /* Image Directory path */ { img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1); + if(img_fol->imgdirpath == NULL){ + return 1; + } strcpy(img_fol->imgdirpath,opj_optarg); img_fol->set_imgdir=1; } @@ -1540,6 +1550,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param } return 0; + } /* -------------------------------------------------------------------------- */ @@ -1635,7 +1646,7 @@ int main(int argc, char **argv) { /* 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 */ if(parse_cmdline_encoder(argc, argv, ¶meters,&img_fol, &raw_cp, indexfilename, sizeof(indexfilename)) == 1) { - return 1; + goto fails; } /* Read directory if necessary */ @@ -1848,7 +1859,9 @@ int main(int argc, char **argv) { OPJ_BYTE *l_data; OPJ_UINT32 l_data_size = 512*512*3; l_data = (OPJ_BYTE*) calloc( 1,l_data_size); - assert( l_data ); + if(l_data == NULL){ + goto fails; + } for (i=0;i test_tile_encoder: failed to write the tile %d!\n",i); @@ -1904,4 +1917,16 @@ int main(int argc, char **argv) { } return 0; + +fails: + if(parameters.cp_comment) free(parameters.cp_comment); + if(parameters.cp_matrice) free(parameters.cp_matrice); + if(raw_cp.rawComps) free(raw_cp.rawComps); + if(img_fol.imgdirpath) free(img_fol.imgdirpath); + if(dirptr){ + if(dirptr->filename_buf) free(dirptr->filename_buf); + if(dirptr->filename) free(dirptr->filename); + free(dirptr); + } + return 1; } diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index f3b1cd5c..ab7ff04a 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -680,6 +680,9 @@ int parse_cmdline_decoder(int argc, char **argv, opj_decompress_parameters *para case 'y': /* Image Directory path */ { img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1); + if(img_fol->imgdirpath == NULL){ + return 1; + } strcpy(img_fol->imgdirpath,opj_optarg); img_fol->set_imgdir=1; } @@ -1200,8 +1203,7 @@ int main(int argc, char **argv) /* parse input and get user encoding parameters */ if(parse_cmdline_decoder(argc, argv, ¶meters,&img_fol) == 1) { - destroy_parameters(¶meters); - return EXIT_FAILURE; + failed = 1; goto fin; } /* Initialize reading of directory */ @@ -1210,26 +1212,30 @@ int main(int argc, char **argv) num_images=get_num_images(img_fol.imgdirpath); dirptr=(dircnt_t*)malloc(sizeof(dircnt_t)); - if(dirptr){ - dirptr->filename_buf = (char*)malloc((size_t)num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/ - dirptr->filename = (char**) malloc((size_t)num_images*sizeof(char*)); - - if(!dirptr->filename_buf){ - destroy_parameters(¶meters); - return EXIT_FAILURE; - } - for(it_image=0;it_imagefilename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN; - } - } - if(load_images(dirptr,img_fol.imgdirpath)==1){ + if(!dirptr){ destroy_parameters(¶meters); return EXIT_FAILURE; } + dirptr->filename_buf = (char*)malloc((size_t)num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/ + if(!dirptr->filename_buf){ + failed = 1; goto fin; + } + + dirptr->filename = (char**) malloc((size_t)num_images*sizeof(char*)); + + if(!dirptr->filename){ + failed = 1; goto fin; + } + for(it_image=0;it_imagefilename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN; + } + + if(load_images(dirptr,img_fol.imgdirpath)==1){ + failed = 1; goto fin; + } if (num_images==0){ fprintf(stdout,"Folder is empty\n"); - destroy_parameters(¶meters); - return EXIT_FAILURE; + failed = 1; goto fin; } }else{ num_images=1; @@ -1254,8 +1260,7 @@ int main(int argc, char **argv) l_stream = opj_stream_create_default_file_stream(parameters.infile,1); if (!l_stream){ fprintf(stderr, "ERROR -> failed to create the stream from the file %s\n", parameters.infile); - destroy_parameters(¶meters); - return EXIT_FAILURE; + failed = 1; goto fin; } /* decode the JPEG2000 stream */ @@ -1297,21 +1302,19 @@ int main(int argc, char **argv) /* Setup the decoder decoding parameters using user parameters */ if ( !opj_setup_decoder(l_codec, &(parameters.core)) ){ fprintf(stderr, "ERROR -> opj_decompress: failed to setup the decoder\n"); - destroy_parameters(¶meters); opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); - return EXIT_FAILURE; + failed = 1; goto fin; } /* Read the main header of the codestream and if necessary the JP2 boxes*/ if(! opj_read_header(l_stream, l_codec, &image)){ fprintf(stderr, "ERROR -> opj_decompress: failed to read the header\n"); - destroy_parameters(¶meters); opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); opj_image_destroy(image); - return EXIT_FAILURE; + failed = 1; goto fin; } if (!parameters.nb_tile_to_decode) { @@ -1319,21 +1322,19 @@ int main(int argc, char **argv) if (!opj_set_decode_area(l_codec, image, (OPJ_INT32)parameters.DA_x0, (OPJ_INT32)parameters.DA_y0, (OPJ_INT32)parameters.DA_x1, (OPJ_INT32)parameters.DA_y1)){ fprintf(stderr, "ERROR -> opj_decompress: failed to set the decoded area\n"); - destroy_parameters(¶meters); opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); opj_image_destroy(image); - return EXIT_FAILURE; + failed = 1; goto fin; } /* Get the decoded image */ if (!(opj_decode(l_codec, l_stream, image) && opj_end_decompress(l_codec, l_stream))) { fprintf(stderr,"ERROR -> opj_decompress: failed to decode image!\n"); - destroy_parameters(¶meters); opj_destroy_codec(l_codec); opj_stream_destroy(l_stream); opj_image_destroy(image); - return EXIT_FAILURE; + failed = 1; goto fin; } } else { @@ -1344,16 +1345,15 @@ int main(int argc, char **argv) opj_destroy_codec(l_codec); opj_stream_destroy(l_stream); opj_image_destroy(image); - return EXIT_FAILURE; + failed = 1; goto fin; }*/ if (!opj_get_decoded_tile(l_codec, l_stream, image, parameters.tile_index)) { fprintf(stderr, "ERROR -> opj_decompress: failed to decode tile!\n"); - destroy_parameters(¶meters); opj_destroy_codec(l_codec); opj_stream_destroy(l_stream); opj_image_destroy(image); - return EXIT_FAILURE; + failed = 1; goto fin; } fprintf(stdout, "tile %d is decoded!\n\n", parameters.tile_index); } @@ -1432,9 +1432,8 @@ int main(int argc, char **argv) image = upsample_image_components(image); if (image == NULL) { fprintf(stderr, "ERROR -> opj_decompress: failed to upsample image components!\n"); - destroy_parameters(¶meters); opj_destroy_codec(l_codec); - return EXIT_FAILURE; + failed = 1; goto fin; } } @@ -1456,9 +1455,8 @@ int main(int argc, char **argv) } if (image == NULL) { fprintf(stderr, "ERROR -> opj_decompress: failed to convert to RGB image!\n"); - destroy_parameters(¶meters); opj_destroy_codec(l_codec); - return EXIT_FAILURE; + failed = 1; goto fin; } } @@ -1567,10 +1565,17 @@ int main(int argc, char **argv) if(failed) (void)remove(parameters.outfile); /* ignore return value */ } +fin: destroy_parameters(¶meters); + if(failed && img_fol.imgdirpath) free(img_fol.imgdirpath); + if(dirptr){ + if(dirptr->filename) free(dirptr->filename); + if(dirptr->filename_buf) free(dirptr->filename_buf); + free(dirptr); + } if (numDecompressedImages) { fprintf(stdout, "decode time: %d ms\n", (int)( (tCumulative * 1000.0) / (OPJ_FLOAT64)numDecompressedImages)); } return failed ? EXIT_FAILURE : EXIT_SUCCESS; } -/*end main*/ +/*end main()*/ diff --git a/src/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c index bd608c2b..d62eea14 100644 --- a/src/bin/jp2/opj_dump.c +++ b/src/bin/jp2/opj_dump.c @@ -341,6 +341,9 @@ static int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *param case 'y': /* Image Directory path */ { img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1); + if(img_fol->imgdirpath == NULL){ + return 1; + } strcpy(img_fol->imgdirpath,opj_optarg); img_fol->set_imgdir=1; } @@ -442,6 +445,8 @@ int main(int argc, char *argv[]) /* Parse input and get user encoding parameters */ if(parse_cmdline_decoder(argc, argv, ¶meters,&img_fol) == 1) { + if(img_fol.imgdirpath) free(img_fol.imgdirpath); + return EXIT_FAILURE; } @@ -451,25 +456,31 @@ int main(int argc, char *argv[]) num_images=get_num_images(img_fol.imgdirpath); dirptr=(dircnt_t*)malloc(sizeof(dircnt_t)); - if(dirptr){ - dirptr->filename_buf = (char*)malloc((size_t)num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/ - dirptr->filename = (char**) malloc((size_t)num_images*sizeof(char*)); - - if(!dirptr->filename_buf){ - return EXIT_FAILURE; - } - - for(it_image=0;it_imagefilename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN; - } - } - if(load_images(dirptr,img_fol.imgdirpath)==1){ + if(!dirptr){ return EXIT_FAILURE; } + dirptr->filename_buf = (char*)malloc((size_t)num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/ + if(!dirptr->filename_buf){ + free(dirptr); + return EXIT_FAILURE; + } + dirptr->filename = (char**) malloc((size_t)num_images*sizeof(char*)); + + if(!dirptr->filename){ + goto fails; + } + + for(it_image=0;it_imagefilename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN; + } + + if(load_images(dirptr,img_fol.imgdirpath)==1){ + goto fails; + } if (num_images==0){ fprintf(stdout,"Folder is empty\n"); - return EXIT_FAILURE; + goto fails; } }else{ num_images=1; @@ -480,7 +491,7 @@ int main(int argc, char *argv[]) fout = fopen(parameters.outfile,"w"); if (!fout){ fprintf(stderr, "ERROR -> failed to open %s for writing\n", parameters.outfile); - return EXIT_FAILURE; + goto fails; } } else @@ -504,7 +515,7 @@ int main(int argc, char *argv[]) l_stream = opj_stream_create_default_file_stream(parameters.infile,1); if (!l_stream){ fprintf(stderr, "ERROR -> failed to create the stream from the file %s\n",parameters.infile); - return EXIT_FAILURE; + goto fails; } /* Read the JPEG2000 stream */ @@ -546,7 +557,7 @@ int main(int argc, char *argv[]) opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); fclose(fout); - return EXIT_FAILURE; + goto fails; } /* Read the main header of the codestream and if necessary the JP2 boxes*/ @@ -556,7 +567,7 @@ int main(int argc, char *argv[]) opj_destroy_codec(l_codec); opj_image_destroy(image); fclose(fout); - return EXIT_FAILURE; + goto fails; } opj_dump_codec(l_codec, img_fol.flag, fout ); @@ -588,4 +599,12 @@ int main(int argc, char *argv[]) fclose(fout); return EXIT_SUCCESS; + +fails: + if(dirptr){ + if(dirptr->filename) free(dirptr->filename); + if(dirptr->filename_buf) free(dirptr->filename_buf); + free(dirptr); + } + return EXIT_FAILURE; } diff --git a/src/lib/openjp2/cidx_manager.c b/src/lib/openjp2/cidx_manager.c index ff2dbdaa..30561ed2 100644 --- a/src/lib/openjp2/cidx_manager.c +++ b/src/lib/openjp2/cidx_manager.c @@ -60,7 +60,9 @@ int opj_write_cidx( int offset, opj_stream_private_t *cio, opj_codestream_info_t lenp = -1; box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t)); - + if(box == NULL){ + return 0; + } for (i=0;i<2;i++){ if(i) diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index f6be14de..4dc69773 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -2094,7 +2094,7 @@ static OPJ_BOOL opj_j2k_read_siz(opj_j2k_t *p_j2k, opj_event_msg(p_manager, EVT_ERROR, "JPWL: bad image size (%d x %d)\n", l_image->x1, l_image->y1); - if (!JPWL_ASSUME || JPWL_ASSUME) { + if (!JPWL_ASSUME) { opj_event_msg(p_manager, EVT_ERROR, "JPWL: giving up\n"); return OPJ_FALSE; } @@ -2276,7 +2276,7 @@ static OPJ_BOOL opj_j2k_read_siz(opj_j2k_t *p_j2k, if (!l_cp->tcps) { opj_event_msg(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR, "JPWL: could not alloc tcps field of cp\n"); - if (!JPWL_ASSUME || JPWL_ASSUME) { + if (!JPWL_ASSUME) { opj_event_msg(p_manager, EVT_ERROR, "JPWL: giving up\n"); return OPJ_FALSE; } @@ -2584,6 +2584,9 @@ static OPJ_BOOL opj_j2k_read_cod ( opj_j2k_t *p_j2k, p_j2k->cstr_info->prog = l_tcp->prg; p_j2k->cstr_info->numlayers = l_tcp->numlayers; p_j2k->cstr_info->numdecompos = (OPJ_INT32*) opj_malloc(l_image->numcomps * sizeof(OPJ_UINT32)); + if(!p_j2k->cstr_info->numdecompos){ + return OPJ_FALSE; + } for (i = 0; i < l_image->numcomps; ++i) { p_j2k->cstr_info->numdecompos[i] = l_tcp->tccps[i].numresolutions - 1; } @@ -4627,7 +4630,7 @@ static OPJ_BOOL opj_j2k_read_rgn (opj_j2k_t *p_j2k, opj_event_msg(p_manager, EVT_ERROR, "JPWL: bad component number in RGN (%d when there are only %d)\n", l_comp_room, l_nb_comp); - if (!JPWL_ASSUME || JPWL_ASSUME) { + if (!JPWL_ASSUME) { opj_event_msg(p_manager, EVT_ERROR, "JPWL: giving up\n"); return OPJ_FALSE; } diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index 6c6f6e83..a607c8a9 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -646,12 +646,13 @@ static OPJ_BYTE * opj_jp2_write_bpcc( opj_jp2_t *jp2, { OPJ_UINT32 i; /* room for 8 bytes for box and 1 byte for each component */ - OPJ_UINT32 l_bpcc_size = 8 + jp2->numcomps; + OPJ_UINT32 l_bpcc_size; OPJ_BYTE * l_bpcc_data,* l_current_bpcc_ptr; /* preconditions */ assert(jp2 != 00); assert(p_nb_bytes_written != 00); + l_bpcc_size = 8 + jp2->numcomps; l_bpcc_data = (OPJ_BYTE *) opj_calloc(1,l_bpcc_size); if (l_bpcc_data == 00) { @@ -1404,6 +1405,10 @@ static OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2, OPJ_UINT32 rl, ol, ra, oa, rb, ob, il; cielab = (OPJ_UINT32*)opj_malloc(9 * sizeof(OPJ_UINT32)); + if(cielab == NULL){ + opj_event_msg(p_manager, EVT_ERROR, "Not enough memory for cielab\n"); + return OPJ_FALSE; + } cielab[0] = 14; /* enumcs */ /* default values */ @@ -1639,7 +1644,7 @@ static OPJ_BOOL opj_jp2_write_ftyp(opj_jp2_t *jp2, opj_event_mgr_t * p_manager ) { OPJ_UINT32 i; - OPJ_UINT32 l_ftyp_size = 16 + 4 * jp2->numcl; + OPJ_UINT32 l_ftyp_size; OPJ_BYTE * l_ftyp_data, * l_current_data_ptr; OPJ_BOOL l_result; @@ -1647,6 +1652,7 @@ static OPJ_BOOL opj_jp2_write_ftyp(opj_jp2_t *jp2, assert(cio != 00); assert(jp2 != 00); assert(p_manager != 00); + l_ftyp_size = 16 + 4 * jp2->numcl; l_ftyp_data = (OPJ_BYTE *) opj_calloc(1,l_ftyp_size); diff --git a/src/lib/openjp2/phix_manager.c b/src/lib/openjp2/phix_manager.c index 5a3e8838..45e559d4 100644 --- a/src/lib/openjp2/phix_manager.c +++ b/src/lib/openjp2/phix_manager.c @@ -57,7 +57,9 @@ int opj_write_phix( int coff, opj_codestream_info_t cstr_info, OPJ_BOOL EPHused, OPJ_OFF_T lenp = 0; box = (opj_jp2_box_t *)opj_calloc( (size_t)cstr_info.numcomps, sizeof(opj_jp2_box_t)); - + if(box == NULL){ + return 0; + } for( i=0;i<2;i++){ if (i) opj_stream_seek( cio, lenp, p_manager); diff --git a/src/lib/openjp2/ppix_manager.c b/src/lib/openjp2/ppix_manager.c index fce51489..018a8812 100644 --- a/src/lib/openjp2/ppix_manager.c +++ b/src/lib/openjp2/ppix_manager.c @@ -61,7 +61,9 @@ int opj_write_ppix( int coff, opj_codestream_info_t cstr_info, OPJ_BOOL EPHused, lenp = -1; box = (opj_jp2_box_t *)opj_calloc( (size_t)cstr_info.numcomps, sizeof(opj_jp2_box_t)); - + if(box == NULL){ + return 0; + } for (i=0;i<2;i++){ if (i) diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c index a3ca93e8..ae83fd52 100644 --- a/src/lib/openjp2/t1.c +++ b/src/lib/openjp2/t1.c @@ -381,7 +381,7 @@ static void opj_t1_enc_sigpass_step( opj_t1_t *t1, flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (OPJ_UINT32)(*flagsp); if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) { - v = opj_int_abs(*datap) & one ? 1 : 0; + v = (opj_int_abs(*datap) & one) ? 1 : 0; opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient)); /* ESSAI */ if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */ opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v); @@ -625,7 +625,7 @@ static void opj_t1_enc_refpass_step( opj_t1_t *t1, flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (OPJ_UINT32)(*flagsp); if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) { *nmsedec += opj_t1_getnmsedec_ref((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno)); - v = opj_int_abs(*datap) & one ? 1 : 0; + v = (opj_int_abs(*datap) & one) ? 1 : 0; opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag)); /* ESSAI */ if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */ opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v); @@ -849,7 +849,7 @@ static void opj_t1_enc_clnpass_step( } if (!(*flagsp & (T1_SIG | T1_VISIT))) { opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient)); - v = opj_int_abs(*datap) & one ? 1 : 0; + v = (opj_int_abs(*datap) & one) ? 1 : 0; opj_mqc_encode(mqc, (OPJ_UINT32)v); if (v) { LABEL_PARTIAL: diff --git a/src/lib/openjp2/thix_manager.c b/src/lib/openjp2/thix_manager.c index 0967b1e9..0bd79897 100644 --- a/src/lib/openjp2/thix_manager.c +++ b/src/lib/openjp2/thix_manager.c @@ -49,7 +49,9 @@ int opj_write_thix( int coff, opj_codestream_info_t cstr_info, opj_stream_privat lenp = 0; box = (opj_jp2_box_t *)opj_calloc( (size_t)(cstr_info.tw*cstr_info.th), sizeof(opj_jp2_box_t)); - + if(box == NULL){ + return 0; + } for ( i = 0; i < 2 ; i++ ){ if (i) opj_stream_seek( cio, lenp, p_manager); diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c index 6ce628b5..d01a7e52 100644 --- a/tests/test_tile_encoder.c +++ b/tests/test_tile_encoder.c @@ -129,7 +129,9 @@ int main (int argc, char *argv[]) l_data_size = (OPJ_UINT32)tile_width * (OPJ_UINT32)tile_height * (OPJ_UINT32)num_comps * (OPJ_UINT32)(comp_prec/8); l_data = (OPJ_BYTE*) malloc(l_data_size * sizeof(OPJ_BYTE)); - + if(l_data == NULL){ + return 1; + } fprintf(stdout, "Encoding random values -> keep in mind that this is very hard to compress\n"); for (i=0;i test_tile_encoder: failed to setup the codec!\n"); opj_destroy_codec(l_codec); opj_image_destroy(l_image); + free(l_data); return 1; } @@ -268,6 +273,7 @@ int main (int argc, char *argv[]) fprintf(stderr, "ERROR -> test_tile_encoder: failed to create the stream from the output file %s !\n",output_file ); opj_destroy_codec(l_codec); opj_image_destroy(l_image); + free(l_data); return 1; } @@ -276,6 +282,7 @@ int main (int argc, char *argv[]) opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); opj_image_destroy(l_image); + free(l_data); return 1; } @@ -285,6 +292,7 @@ int main (int argc, char *argv[]) opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); opj_image_destroy(l_image); + free(l_data); return 1; } } @@ -294,6 +302,7 @@ int main (int argc, char *argv[]) opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); opj_image_destroy(l_image); + free(l_data); return 1; }