From patchwork Thu Jun 22 18:55:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4081 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp199680vsw; Thu, 22 Jun 2017 11:57:13 -0700 (PDT) X-Received: by 10.28.13.139 with SMTP id 133mr2895300wmn.82.1498157833469; Thu, 22 Jun 2017 11:57:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498157833; cv=none; d=google.com; s=arc-20160816; b=m/palj6HTmNVRUr5E2My8tR6BaWH6kDQC15kLWFAgo5SQvTyXX4jn3j08b+rzhyBsB lIjmnMtBzpH5h17+x0TGrsDTMlqs3/OpPL1M5ckbetlxd9nBtTKWW9CL0O6mQUHpHozx PBM2W4lqVdMl7TNg3zebst2ECYhVtTE3SHxar080hJRBCOQFkxFQmuOorA07q6djJbYi mGeD8lr6kBgmUNdac9Fk19GEtQwl4WffjJ70vEGvO6XThCiSpoKCtO+vE3NjVLL6JzBB QZm1lBuO5EzW/OCkmmm6K7/8WRlOtaKhDFT9q6Tz+iftKEb24tZuqwcIzvpSlqbfmgo4 Sw7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=fAsC6+ilMRf3N3G8bA9ljXkS2xkR9acIHW4Qx7mLS7A=; b=Rd1zZq7Osrw4h4JfKgE8BNFZt975si4qM11AXviEFLFGmf1NT/wX45h6bYkqJbY64q S3nFbNcpL/praLj0Zk28KMQoMYXWyx6FhZ7sEwFaFWaPnIoUn0ncVr4+/Ull7FUfa6oO 4d2dMgkvNcbo1vRevPxFBG2cyWMoyCIx3fyhseSbj7YKTX5eebMEqR3AD6hDmRkRNHp1 Wz6ml+gnxrIJiBT9GsVm58XaJJhfosSxkMNKVUW6nT9VX127mec3mF0rVrx9xQ/jq6p8 bbdtS/IUzLnj58uSLX0WxJXTCYeDU+aA2vvoVhYRISDby1wZIO5+zieQ0JnTGot326/s N/gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=rvPOUz/I; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t103si2339420wrc.248.2017.06.22.11.57.12; Thu, 22 Jun 2017 11:57:13 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=rvPOUz/I; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2220568A195; Thu, 22 Jun 2017 21:57:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D6CB68A104 for ; Thu, 22 Jun 2017 21:57:02 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id w12so2640833qta.2 for ; Thu, 22 Jun 2017 11:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=1GFg5uRLauaDqehlwYg1VMZYNCCJVGTWsl7aKCUFW54=; b=rvPOUz/Is12JPkq/WvhH0ynCwegmeT2dDvJZWAIjZDbFp8iO/cE8KW8PqHkzSpID4h Z7Z/WhqhKVSupvT+Vu4+bkNa39Gk6nExG55VTi1uHFmkuXT3y6f8aHmDVcgjS1ctqaCY ArE/yFIcO9CsufBeYVatMnKMZKhvgaLvZHb3Teehg83+LSCBaw3DR6xN+OhBn2Y52VCZ CODx7n7xvtPuyWBMo+aGuAwx//J4D9WwcuyXwHHdnjijCKWyX/kfscPQplftjtCc/zzV ZsPMjcUEuDG/u5LoWbN/wfcZqkhtNcc+5fbb5SZ4VyWgsl5+L87BPEoJMWI6tO3V2SXS etWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=1GFg5uRLauaDqehlwYg1VMZYNCCJVGTWsl7aKCUFW54=; b=XpKSq6xDPGWD6SJPVmzbh3jSpWEG11aDvHDeUgK6JTLy41dP7klmwCXs9vVg3LR1HY OL6KZwQadAL4jqv5Qx3joeIaXYWtE9W9SdsQTdSLBia3LZlAZeyhs4ZM7pR2D81JFBo9 Rta5DuN0VX5xb0ebnpqXflnAxvzOwj6lfz90laY/qMjOPoRNwEWXQ35IVEgty9RKlcZ7 zRzpGCDccw3HuYaT6n+emV+8/wLGz3zF8lfIJHLdMY7Xth588XClBa11Lq3ykAI4vfIQ YTjwq2KNqGc+fHcMqUX86oYTonN2HZiC03GxaUC8zkjMHAxpJ/TAWKqG55bfYmUxPsfb vypg== X-Gm-Message-State: AKS2vOxNtkRj0pTe+MrLPULLwkAMunnn8lYA1ucUDaIn78yRepeNEdS8 TPM9T8IIt/DlRMYj X-Received: by 10.200.50.2 with SMTP id x2mr5222191qta.23.1498157820746; Thu, 22 Jun 2017 11:57:00 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id a62sm1585874qkd.14.2017.06.22.11.56.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jun 2017 11:57:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Jun 2017 15:55:57 -0300 Message-Id: <20170622185557.1176-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avformat/oggenc: check for stream private data in ogg_free() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes a NULL pointer derefence when ogg_init() returns a failure and a stream's private data was not yet allocated. This is a regression since 3c5a53cdfa099bba8bd951f95b85727b4b3b5d68 Signed-off-by: James Almer --- libavformat/oggenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 7c1115afd6..10c4eda062 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -743,6 +743,8 @@ static void ogg_free(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; OGGStreamContext *oggstream = st->priv_data; + if (!oggstream) + continue; if (st->codecpar->codec_id == AV_CODEC_ID_FLAC || st->codecpar->codec_id == AV_CODEC_ID_SPEEX || st->codecpar->codec_id == AV_CODEC_ID_OPUS ||