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

fixed a segfault with fgets return value for some cases inside test function compare_dump_file()

This commit is contained in:
Mickael Savinaud 2011-08-31 16:51:37 +00:00
parent aaa47850c3
commit 22a2f98ced
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -6,6 +6,7 @@ What's New for OpenJPEG
+ : added + : added
August 31, 2011 August 31, 2011
* [mickael] fixed a segfault with fgets return value for some cases inside test function compare_dump_file()
+ [mickael] enhance the encoding test suite and remove unsued CONFIGURE_FILE into a CMakeList + [mickael] enhance the encoding test suite and remove unsued CONFIGURE_FILE into a CMakeList
August 30, 2011 August 30, 2011

39
tests/compare_dump_files.c
View File

@ -190,7 +190,6 @@ int main(int argc, char **argv)
size_t nbytes = 2048; size_t nbytes = 2048;
int CRLF_shift=1; int CRLF_shift=1;
char *strbase, *strtest, *strbase_d, *strtest_d; char *strbase, *strtest, *strbase_d, *strtest_d;
char *return_value_fgets;
printf("Files differ at line %lu:\n", l); printf("Files differ at line %lu:\n", l);
fseek(fbase,pos,SEEK_SET); fseek(fbase,pos,SEEK_SET);
@ -207,27 +206,29 @@ int main(int argc, char **argv)
strbase = (char *) malloc(nbytes + 1); strbase = (char *) malloc(nbytes + 1);
strtest = (char *) malloc(nbytes + 1); strtest = (char *) malloc(nbytes + 1);
return_value_fgets = fgets(strbase, nbytes, fbase); if (fgets(strbase, nbytes, fbase) == NULL)
if (!strcmp(return_value_fgets,strbase)) fprintf(stderr,"\nWARNING: fgets return a NULL value");
fprintf(stderr,"\nWARNING: fgets return a value different that the first argument"); else
free(return_value_fgets); {
if (fgets(strtest, nbytes, ftest) == NULL)
fprintf(stderr,"\nWARNING: fgets return a NULL value");
else
{
strbase_d = (char *) malloc(strlen(strbase)+1);
strtest_d = (char *) malloc(strlen(strtest)+1);
strncpy(strbase_d, strbase, strlen(strbase)-1);
strncpy(strtest_d, strtest, strlen(strtest)-CRLF_shift);
strbase_d[strlen(strbase)-1] = '\0';
strtest_d[strlen(strtest)-CRLF_shift] = '\0';
printf("<%s> vs. <%s>\n", strbase_d, strtest_d);
free(strbase_d);free(strtest_d);
}
}
return_value_fgets = fgets(strtest, nbytes, ftest); free(strbase);free(strtest);
if (!strcmp(return_value_fgets,strtest))
fprintf(stderr,"\nWARNING: fgets return a value different that the first argument");
free(return_value_fgets);
strbase_d = (char *) malloc(strlen(strbase)+1); same = 0;
strtest_d = (char *) malloc(strlen(strtest)+1);
strncpy(strbase_d, strbase, strlen(strbase)-1);
strncpy(strtest_d, strtest, strlen(strtest)-CRLF_shift);
strbase_d[strlen(strbase)-1] = '\0';
strtest_d[strlen(strtest)-CRLF_shift] = '\0';
printf("<%s> vs. <%s>\n", strbase_d, strtest_d);
free(strbase);free(strtest);
free(strbase_d);free(strtest_d);
same = 0;
break; break;
} }
else else