From patchwork Mon Jan 6 14:51:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17217 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CC33644A0A0 for ; Mon, 6 Jan 2020 17:09:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA4E868A9A8; Mon, 6 Jan 2020 17:09:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E50D5689B6E for ; Mon, 6 Jan 2020 17:09:09 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id f129so15611099wmf.2 for ; Mon, 06 Jan 2020 07:09:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WxavAlD7eMBB77BA1p5m8oecNheHbsELwjNK/psDjr4=; b=sQqfe7WKsBYMVI+PvwE+hjfaL9szVRqodU2bRX/iPjpEBOkyWi2iJmCNys3UismSEU wWGwtDXAictq21C4kzqGdO6ukcBsBGomjhJzlnb3LPR/5aw5sBkMCCuBmyeOnQJ2pKC/ vE9zKsSmxdwyqMtCvcYowMRv2jb1c2oTYoG2m3jdjc0mfSswdPsRdgk8BN+k0wPNxhJJ t1Pric+dDll8ZQWuOghD6tTuaLdN3oSU/QQi1cOmZvkTEGqrK42lc4l7WhZ62WzQpB1D XSiR6bV0s/it4A7N/ooNbboUYSYgo8MZInetVRlRjRQUKURa02AGMn53UbY5ZWvOklkR 4n6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WxavAlD7eMBB77BA1p5m8oecNheHbsELwjNK/psDjr4=; b=phH3/AHK2zp9bgh91shQXM/yrTl5+V3aYaCIKtZFknvbU25hT2NZE0UP1Y4hEaGooO ajjlYn5ZvHCetywAMSZjXOBBO88TbPurN1GPYwjWW17xnVbwZkrhQmepJy4t4oaTM7d+ QRicIQ0899g8FIIEjQ8EA6lxvTY218d1LsnNvuGZwiuoa9g2P+/0mABrLRfnJmGyvVbr 0/ev99n9qxKieiCQVNLnflh2R5ciBkXJ8oChBs9kY7bDWegw812ns9/rQVonHl1mJROO lu6ePEJjWr3dSAM8U6qG1G2zjw3lyMQe8jwrGhHxdo6GugaMc6VfI6iUpBYhNm88X7ml 2BEg== X-Gm-Message-State: APjAAAX3lRAfqloAxqTwfdHMCTUOzqCTf9rr5sP19D/xlSJzP1sxC/Mz IE1nq0dJTISksAl2kAgAnWtf8uHS X-Google-Smtp-Source: APXvYqxxDwjvWYVjSkjtCwm/nCV6Twh3ljqKF1pCCRUUNtz7OgJkEcZpFUieZirB5L9i7hjC4fU7kA== X-Received: by 2002:a7b:cb0d:: with SMTP id u13mr36573869wmj.68.1578322874361; Mon, 06 Jan 2020 07:01:14 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id t12sm72311964wrs.96.2020.01.06.07.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 07:01:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Jan 2020 15:51:49 +0100 Message-Id: <20200106145149.18688-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200106145149.18688-1-andreas.rheinhardt@gmail.com> References: <20200106145149.18688-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/aviobuf: Honor avio_open[2] documentation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- libavformat/aviobuf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 0e2f038988..cc22beff28 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1145,6 +1145,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;