From patchwork Mon Nov 27 07:11:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 6401 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1343333jah; Sun, 26 Nov 2017 23:11:48 -0800 (PST) X-Google-Smtp-Source: AGs4zMabVddWrWjnRM3FmwI2K6lH8pr8E8KgDZWr14FsuVcFvpoVPruvAf1eANC41E1a0Wj61Jd1 X-Received: by 10.28.234.71 with SMTP id i68mr15984319wmh.7.1511766708137; Sun, 26 Nov 2017 23:11:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511766708; cv=none; d=google.com; s=arc-20160816; b=s70n8yayigIG1BQfgE83UjTsL6opaGUnhqzP4aPcSYiCpCVsn5BDsgOuG+eAvV7xyg SrUVHLnc26cW+kUphrPqUaNtuDzz5kgpbpF6DFfKM98kHALRdG+0hYW4edWhH8N1o/aC k5Vod2ZHuFkrzvwL345OikGHWBy0sCpUqc0hw+HLrc9aSs6i26/Q9DYCiH/kaM8mpRv3 em9611tiPgzUS5fmlB/sB08rdTf693C8PcHcvL8xAmvvGD2GGEuwscLnShcGk25ICKkK MTZgUUwsXkOfa9WvYgXKRMa8nwkCH2vi7c0TXMXhqkgMBiYXAipXEdOJQC4iRFYA6bIq MWzg== 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=9ZE/82lTD6y/4q6ExJKL9DdjoILXEu1lMp7d4rvQGqY=; b=DGHAgyxDP2dUyzBxFRGqamgQsbzDKj9KL1MgYNcPjGE/ENFAY3VGiAvDhO0Gni45l6 NXuAWQK77cTIoQ0HkEBLw9O1oWEgDfUywkGL1yY6SNmjjyOvN6mgupSSJo4CxlRe1DmR cnuSTATpbENfioFQU0ll/dF0JOs+vWpn21Qzqqv2s753aIrLf0y/IZ7ALljW1nVDGjH7 lctGtud2SiU1o941ktLiJpxqR2+GhwTasgEraadtgjYx3125tUbryBXuwzTdu46gR+OB 5r5GZbwv9QaTcUzZ95P2RGc8VD6gErANRDBaW8/uISp+O9D7O/UrL1oN9ruF2WEg9MeV eDIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b=jDy+tZV8; 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 w63si10716470wma.184.2017.11.26.23.11.47; Sun, 26 Nov 2017 23:11:48 -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=jDy+tZV8; 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 8EF1168A1E3; Mon, 27 Nov 2017 09:11:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-11.163.com (m12-11.163.com [220.181.12.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EDF82689C8C for ; Mon, 27 Nov 2017 09:11:36 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=oqmAkeVvQtmWeO39oD 5+XSwNGiGbFmLY8GTUaIxx+wk=; b=jDy+tZV80x79foSPjAfF6vaQSa9FykcQn4 r7k08mBFqlhcUJzoY/65n50RsAoU3yadI+C1aSk/sETSAT8Mn4yEGs2akgIBLHpw MdhRrcMtBrthyoYUIaIraarIK6UgX85orUrsRANQ2qH0YfiB5jG6Rd59KR+wyLxb NaQbKN3PU= Received: from localhost.localdomain (unknown [106.120.213.112]) by smtp7 (Coremail) with SMTP id C8CowABnq+mluhtaLv3BBQ--.13422S3; Mon, 27 Nov 2017 15:11:36 +0800 (CST) From: Pan Bian To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 15:11:32 +0800 Message-Id: <1511766692-29580-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: C8CowABnq+mluhtaLv3BBQ--.13422S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xw1DJr15Wr15tF43Wr1fXrb_yoWfuFb_Ka yxXa48WrW09rn7Cw4vkrW5Xr4Fk3y8ZFyrXwnxtwnYk34fXr4DCw48Wr15Aw4Sgry7Aw1Y krWDCr47Jr129jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU1KFCUUUUUU== X-Originating-IP: [106.120.213.112] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/1tbiQAidclSIUE4ATAAAsp Subject: [FFmpeg-devel] [FFmpeg-devel 1/1] avformat/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 --- V2: fix patcheck warnings --- libavformat/rtpenc_mpegts.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c index 7af02e0..5f81e1a 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;