From 220846f74fc33fc037147e54535bcaef8caad28b Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 6 Jan 2020 15:51:49 +0100 Subject: [PATCH] avformat/aviobuf: Honor avio_open[2] documentation The documentation of both avio_open() as well as avio_open2() states that on failure, the pointer to an AVIOContext given to this function (via a pointer to a pointer to an AVIOContext) will be set to NULL. Yet it didn't happen upon failure of ffurl_open_whitelist() or when allocating the internal buffer failed. This commit changes this. Signed-off-by: Andreas Rheinhardt Signed-off-by: Michael Niedermayer --- libavformat/aviobuf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 70e1d2ca10..384c3a4cb6 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1197,6 +1197,8 @@ int ffio_open_whitelist(AVIOContext **s, const char *filename, int flags, URLContext *h; int err; + *s = NULL; + err = ffurl_open_whitelist(&h, filename, flags, int_cb, options, whitelist, blacklist, NULL); if (err < 0) return err;