From patchwork Mon Nov 27 01:30:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 6382 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1085105jah; Sun, 26 Nov 2017 17:31:21 -0800 (PST) X-Google-Smtp-Source: AGs4zMamM3SmDVEDbuTHEM4Tj5EE1646pSyS3SJ7YuQHRZ6RqlrVuCibYjsZn22oRGCtGT0xZrdD X-Received: by 10.223.130.205 with SMTP id 71mr14746824wrc.101.1511746281100; Sun, 26 Nov 2017 17:31:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511746281; cv=none; d=google.com; s=arc-20160816; b=UPHL2uBjNRu5zO4/6LqlPT7YIuYWIt0RkXX7OYguj3pjDoH4iIP4rjeLWf/ING9xUC tu2PHhJudWFxMNDSqISPyhGMKU0qjnKTjOqo1vW2aftbinXbi4zA1mrBwXihmw0XrCGP ZCuS+tPK9VY6OrQVbmKjmrbWBzHQm76TviALCfpM1EXYvtrsseA27/2MpWnRJwkZG2/t dwHLbsx9HazUFHI1awM/5sSdDuk3GAp1ON2ys9aPxEdAehGSmNBjm3hmh5VaKxplaBNY isEqi6m2eIQtLn30ir8nCkdXUKrHWzj7xqV+4nGt5o62LiPpqyT4GwDIjwKm47Sr6+E+ uhMg== 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:cc: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=vo6EmLr9TUNKByZZWme8k5EQMkkbYbAQ8GaTQ2CTyPw=; b=V6LgsGevb++hkQxBCtj+s+gZTyex9HiCPcaDFaxHH3sd4TY6trQxMuXCmNpyR6EN96 rSIFIIhWGo4rdr/89UWc1HLfhsGTWGpvL8xKpiaUAy21j4uHSSA3Fut5axNWTxzSV6T2 qHgV5gTsIIMZDVeekAty56cDULslzCsQSkO+Pb8QOnkyF0WUlpE/+lh3Z34e4irP4ZwH SaNAcbouiPt2PxnBSOiPU8RCzCyJ2Jlc/ka9lRqeO9inGofA5w6dJNHvAZQ23JTkjLQg u7PFjsFnIfvh7rPX6rib8CGxFWK1pwt/qtouQvHwIdiZ4rD42JWQ1V3Ryk121DauBLTR 49gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b=hj8dGGlT; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q18si18487588wrc.24.2017.11.26.17.31.20; Sun, 26 Nov 2017 17:31:21 -0800 (PST) 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=@163.com header.s=s110527 header.b=hj8dGGlT; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAD73689DEA; Mon, 27 Nov 2017 03:31:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-14.163.com (m12-14.163.com [220.181.12.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 525D1689BA0 for ; Mon, 27 Nov 2017 03:31:11 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=yRhUYU8qosBmofvT0R r4mgPDArj57shBp/0kcy9s+gw=; b=hj8dGGlTVa2yBgWWkeP294UW/IOYFgD+GI biLnR5vh5u37z7QBeD2yqiUpoTyPJhzvhsWMTMobs/mZkLYuGWDX6Ub2nnvqqnVx KaRqCvsEBsCE4uwgQDitX99a8m00YxbF4VsVhIqWPhsQ7AWNwQfoJMU9ACq/4+dR d+e6AbsIQ= Received: from localhost.localdomain (unknown [106.120.213.112]) by smtp10 (Coremail) with SMTP id DsCowADHBnPTahtadLSFBQ--.41618S3; Mon, 27 Nov 2017 09:31:08 +0800 (CST) From: Pan Bian To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 09:30:53 +0800 Message-Id: <1511746253-22707-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: DsCowADHBnPTahtadLSFBQ--.41618S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xw1DJr15Wr15uw1xCrWDCFg_yoWfAwc_Ka yxXa48WrWj9rn7Cw4vkrW5Xr4Fk3y8ZFyrZwnxtwnYk3yfXr4DCw4xWr15Aw4Sgr13Cw1Y krZ8CrW7Jr129jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU1cdb7UUUUU== X-Originating-IP: [106.120.213.112] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBZx2dcletn5-vNwAAs3 Subject: [FFmpeg-devel] libavformat/rtpenc_mpegts: check avformat_new_stream() return value 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: Pan Bian MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The function avformat_new_stream() returns a NULL pointer on failure. However, in function rtp_mpegts_write_header(), its return value is not validated before it is dereferenced. Check the return value against NULL to avoid potential NULL dereference. Signed-off-by: Pan Bian --- libavformat/rtpenc_mpegts.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c index 7af02e0..9089d61 100644 --- a/libavformat/rtpenc_mpegts.c +++ b/libavformat/rtpenc_mpegts.c @@ -85,6 +85,10 @@ static int rtp_mpegts_write_header(AVFormatContext *s) } rtp_ctx->oformat = rtp_format; st = avformat_new_stream(rtp_ctx, NULL); + if (!st) { + ret = AVERROR(ENOMEM); + goto fail; + } st->time_base.num = 1; st->time_base.den = 90000; st->codecpar->codec_id = AV_CODEC_ID_MPEG2TS;