From 18c5be69e9c2bd195e707a7ef7f1f6625b74a86b Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Mon, 24 Mar 2014 16:01:51 +0000 Subject: [PATCH] [trunk] Make sure to exit early instead of looping on every single pixels --- src/bin/jp2/convert.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index 2ab6d628..e5a8b0bb 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -1867,8 +1867,12 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { { for(compno = 0; compno < numcomps; compno++) { - if ( !fread(&c0, 1, 1, fp) ) - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if ( !fread(&c0, 1, 1, fp) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + opj_image_destroy(image); + return NULL; + } if(one) { image->comps[compno].data[i] = c0;