Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'

* commit '8a78ae2d2101622fd244b99178d8bc61175c878e': segment: Check open_null_ctx() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 449c74f629
parent 63b0356274 8a78ae2d21
commit 449c74f629
1 changed files with 2 additions and 1 deletions
--- 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 {