virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffmpeg_opt: Improve checks for truncation/alloc error

Browse Source 
Do this by switching from the dynamic buffer API to the AVBPrint API;
the former has no defined way to check for errors.
This also avoids allocating an AVIOContext.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-12-01 20:31:27 +01:00
parent 3f3772e444
commit f3a8d208c0
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fftools/ffmpeg_opt.c
View File

@@ -34,6 +34,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/bprint.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
@@ -1645,29 +1646,26 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
} }
/* read file contents into a string */ /* read file contents into a string */
static uint8_t *read_file(const char *filename) static char *read_file(const char *filename)
{ {
AVIOContext *pb = NULL; AVIOContext *pb = NULL;
AVIOContext *dyn_buf = NULL;
int ret = avio_open(&pb, filename, AVIO_FLAG_READ); int ret = avio_open(&pb, filename, AVIO_FLAG_READ);
uint8_t buf[1024], *str; AVBPrint bprint;
char *str;
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Error opening file %s.\n", filename); av_log(NULL, AV_LOG_ERROR, "Error opening file %s.\n", filename);
return NULL; return NULL;
} }
ret = avio_open_dyn_buf(&dyn_buf); av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED);
ret = avio_read_to_bprint(pb, &bprint, SIZE_MAX);
avio_closep(&pb);
if (ret < 0) { if (ret < 0) {
avio_closep(&pb); av_bprint_finalize(&bprint, NULL);
return NULL; return NULL;
} }
while ((ret = avio_read(pb, buf, sizeof(buf))) > 0) ret = av_bprint_finalize(&bprint, &str);
avio_write(dyn_buf, buf, ret);
avio_w8(dyn_buf, 0);
avio_closep(&pb);
ret = avio_close_dyn_buf(dyn_buf, &str);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
return str; return str;
@@ -3276,7 +3274,7 @@ static int opt_filter_complex(void *optctx, const char *opt, const char *arg)
static int opt_filter_complex_script(void *optctx, const char *opt, const char *arg) static int opt_filter_complex_script(void *optctx, const char *opt, const char *arg)
{ {
FilterGraph *fg; FilterGraph *fg;
uint8_t *graph_desc = read_file(arg); char *graph_desc = read_file(arg);
if (!graph_desc) if (!graph_desc)
return AVERROR(EINVAL); return AVERROR(EINVAL);