diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-01-06 15:51:49 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-20 03:59:36 +0200 |
| commit | e13e36f3224b2f90d604b457d25337655715bef7 (patch) | |
| tree | 7fe77090aa0212926244f22bb4b04daa26f901f2 | |
| parent | d74e112ad8c236055c1232d3a14fd5b81d521a61 (diff) | |
| download | ffmpeg-e13e36f3224b2f90d604b457d25337655715bef7.tar.gz | |
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 <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 220846f74fc33fc037147e54535bcaef8caad28b)
| -rw-r--r-- | libavformat/aviobuf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 2d011027c9..de9f210d2d 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1163,6 +1163,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; |