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

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

Fixes issue 262
This commit is contained in:
Mathieu Malaterre 2014-02-26 09:40:19 +00:00
parent b56fb96b1b
commit e231a84b2f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -930,7 +930,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
float *lCurrentDoublePtr; float *lCurrentDoublePtr;
float *lSpace; float *lSpace;
int *l_int_ptr; int *l_int_ptr;
int lNbComp = 0, lTotalComp, lMctComp, i, lStrLen; int lNbComp = 0, lTotalComp, lMctComp, i, lStrLen, lStrFread;
/* Open file */ /* Open file */
FILE * lFile = fopen(lFilename,"r"); 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); lStrLen = ftell(lFile);
fseek(lFile,0,SEEK_SET); fseek(lFile,0,SEEK_SET);
lMatrix = (char *) malloc(lStrLen + 1); lMatrix = (char *) malloc(lStrLen + 1);
fread(lMatrix, lStrLen, 1, lFile); lStrFread = fread(lMatrix, 1, lStrLen, lFile);
fclose(lFile); fclose(lFile);
if( lStrLen != lStrFread ) return 1;
lMatrix[lStrLen] = 0; lMatrix[lStrLen] = 0;
lCurrentPtr = lMatrix; lCurrentPtr = lMatrix;