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

Merge commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e' into release/2.4

Browse Source 
* commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e':
  cmdutils: check file access functions return values

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-17 23:14:06 +01:00
parent 0afeb76e75 cbfdbba58e
commit e7b8fa2c00
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cmdutils.c
View File

@@ -1865,19 +1865,31 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)
strerror(errno)); strerror(errno));
return AVERROR(errno); return AVERROR(errno);
} }
fseek(f, 0, SEEK_END);
*size = ftell(f); ret = fseek(f, 0, SEEK_END);
fseek(f, 0, SEEK_SET); if (ret == -1) {
if (*size == (size_t)-1) { ret = AVERROR(errno);
av_log(NULL, AV_LOG_ERROR, "IO error: %s\n", strerror(errno)); goto out;
fclose(f);
return AVERROR(errno);
} }
ret = ftell(f);
if (ret < 0) {
ret = AVERROR(errno);
goto out;
}
*size = ret;
ret = fseek(f, 0, SEEK_SET);
if (ret == -1) {
ret = AVERROR(errno);
goto out;
}
*bufptr = av_malloc(*size + 1); *bufptr = av_malloc(*size + 1);
if (!*bufptr) { if (!*bufptr) {
av_log(NULL, AV_LOG_ERROR, "Could not allocate file buffer\n"); av_log(NULL, AV_LOG_ERROR, "Could not allocate file buffer\n");
fclose(f); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto out;
} }
ret = fread(*bufptr, 1, *size, f); ret = fread(*bufptr, 1, *size, f);
if (ret < *size) { if (ret < *size) {
@@ -1893,6 +1905,8 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)
(*bufptr)[(*size)++] = '\0'; (*bufptr)[(*size)++] = '\0';
} }
out:
av_log(NULL, AV_LOG_ERROR, "IO error: %s\n", av_err2str(ret));
fclose(f); fclose(f);
return ret; return ret;
} }