diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:10:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:10:47 +0200 |
| commit | 449c74f629cb35cfd88b5d2b0d7accf0df225bc0 (patch) | |
| tree | a828ffa8fe1277240e9f5e806791b17ca91529b5 /libavformat/segment.c | |
| parent | 63b0356274bc496c486cbedcb563302c36996024 (diff) | |
| parent | 8a78ae2d2101622fd244b99178d8bc61175c878e (diff) | |
| download | ffmpeg-449c74f629cb35cfd88b5d2b0d7accf0df225bc0.tar.gz | |
Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'
* commit '8a78ae2d2101622fd244b99178d8bc61175c878e':
segment: Check open_null_ctx() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segment.c')
| -rw-r--r-- | libavformat/segment.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index 4418d0f338..42471bb190 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -860,7 +860,8 @@ static int seg_write_trailer(struct AVFormatContext *s) if (!seg->write_header_trailer) { if ((ret = segment_end(s, 0, 1)) < 0) goto fail; - open_null_ctx(&oc->pb); + if ((ret = open_null_ctx(&oc->pb)) < 0) + goto fail; ret = av_write_trailer(oc); close_null_ctxp(&oc->pb); } else { |