summaryrefslogtreecommitdiff
path: root/cmdutils.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-12-16 10:43:48 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-12-18 23:23:00 +0100
commit38129c26c51b933d7db423f904ba0cd6a88ca1ed (patch)
treee0ecc0d5ea4562b307aad4a787a0aba9a70091bd /cmdutils.c
parentc63dd3f0a48a9f6389d253597ab51caddc0118db (diff)
downloadffmpeg-38129c26c51b933d7db423f904ba0cd6a88ca1ed.tar.gz
cmdutils: check file access functions return values
CC: libav-stable@libav.org Bug-Id: CID 703706
Diffstat (limited to 'cmdutils.c')
-rw-r--r--cmdutils.c28
1 files changed, 23 insertions, 5 deletions
diff --git a/cmdutils.c b/cmdutils.c
index eff011c7ce..19589cea5b 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -1397,14 +1397,31 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)
strerror(errno));
return AVERROR(errno);
}
- fseek(f, 0, SEEK_END);
- *size = ftell(f);
- fseek(f, 0, SEEK_SET);
+
+ ret = fseek(f, 0, SEEK_END);
+ if (ret == -1) {
+ ret = AVERROR(errno);
+ goto out;
+ }
+
+ 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);
if (!*bufptr) {
av_log(NULL, AV_LOG_ERROR, "Could not allocate file buffer\n");
- fclose(f);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto out;
}
ret = fread(*bufptr, 1, *size, f);
if (ret < *size) {
@@ -1420,6 +1437,7 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)
(*bufptr)[(*size)++] = '\0';
}
+out:
fclose(f);
return ret;
}