generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmdutils: check fread() return value

Browse Source
This commit is contained in:
Janne Grunau 2011-10-30 15:34:32 +01:00
parent 7d1b17b833
commit d94c577d3c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmdutils.c
View File

@ -787,6 +787,7 @@ int read_yesno(void)
int read_file(const char *filename, char **bufptr, size_t *size) int read_file(const char *filename, char **bufptr, size_t *size)
{ {
int ret;
FILE *f = fopen(filename, "rb"); FILE *f = fopen(filename, "rb");
if (!f) { if (!f) {
@ -802,11 +803,22 @@ int read_file(const char *filename, char **bufptr, size_t *size)
fclose(f); fclose(f);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
fread(*bufptr, 1, *size, f); ret = fread(*bufptr, 1, *size, f);
(*bufptr)[*size++] = '\0'; if (ret < *size) {
av_free(*bufptr);
if (ferror(f)) {
av_log(NULL, AV_LOG_ERROR, "Error while reading file '%s': %s\n",
filename, strerror(errno));
ret = AVERROR(errno);
} else
ret = AVERROR_EOF;
} else {
ret = 0;
(*bufptr)[*size++] = '\0';
}
fclose(f); fclose(f);
return 0; return ret;
} }
void init_pts_correction(PtsCorrectionContext *ctx) void init_pts_correction(PtsCorrectionContext *ctx)