diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:57:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:57:25 +0100 |
| commit | 988d27b8029d9b4ccb13e792004cc8375b835eac (patch) | |
| tree | 8931c74a18dcf3876f6db7569a7404b64ed5abab /ffmpeg_opt.c | |
| parent | 76a8127a452f9e149a876c5fa6d6f0634e3b5b1e (diff) | |
| parent | b1306823d0b3ae998c8e10ad832004eb13bdd93e (diff) | |
| download | ffmpeg-988d27b8029d9b4ccb13e792004cc8375b835eac.tar.gz | |
Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
check memory errors from av_strdup()
Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 1f281f605a..ae05bf0571 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -231,6 +231,8 @@ static int opt_map(void *optctx, const char *opt, const char *arg) arg++; } map = av_strdup(arg); + if (!map) + return AVERROR(ENOMEM); /* parse sync stream first, just pick first matching stream */ if (sync = strchr(map, ',')) { |