From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Wed, 26 Feb 2014 09:40:19 +0000 (+0000)
Subject: [trunk] Properly store and use value returned by fread. Also invert nmemb and size... 
X-Git-Tag: version.2.0.1~4^2~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e231a84b2fdabc626458065842a293238653d0c0;p=openjpeg

[trunk] Properly store and use value returned by fread. Also invert nmemb and size in fread call.

Fixes issue 262
---

diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c
index 7b1c9471..da89e512 100644
--- a/src/bin/jp2/opj_compress.c
+++ b/src/bin/jp2/opj_compress.c
@@ -930,7 +930,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
             float *lCurrentDoublePtr;
             float *lSpace;
             int *l_int_ptr;
-            int lNbComp = 0, lTotalComp, lMctComp, i, lStrLen;
+            int lNbComp = 0, lTotalComp, lMctComp, i, lStrLen, lStrFread;
 
             /* Open file */
             FILE * lFile = fopen(lFilename,"r");
@@ -943,8 +943,9 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
             lStrLen = ftell(lFile);
             fseek(lFile,0,SEEK_SET);
             lMatrix = (char *) malloc(lStrLen + 1);
-            fread(lMatrix, lStrLen, 1, lFile);
+            lStrFread = fread(lMatrix, 1, lStrLen, lFile);
             fclose(lFile);
+            if( lStrLen != lStrFread ) return 1;
 
             lMatrix[lStrLen] = 0;
             lCurrentPtr = lMatrix;