Skip to content

F
ffmpeg.wasm-core
Commit 38129c26 authored by Vittorio Giovara's avatar Vittorio Giovara
Browse files
Options

cmdutils: check file access functions return values 

CC: libav-stable@libav.org
Bug-Id: CID 703706
parent c63dd3f0
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 5 deletions
cmdutils.c
View file @ 38129c26
...@@ -1397,14 +1397,31 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size) ...@@ -1397,14 +1397,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) {
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); *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) {
...@@ -1420,6 +1437,7 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size) ...@@ -1420,6 +1437,7 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)
(*bufptr)[(*size)++] = '\0'; (*bufptr)[(*size)++] = '\0';
} }
out:
fclose(f); fclose(f);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment