From patchwork Mon Nov 27 01:12:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 6381 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1071080jah; Sun, 26 Nov 2017 17:13:08 -0800 (PST) X-Google-Smtp-Source: AGs4zMYBUMkr0uDvPEpWTgBe+ABeSS7Q1VLLt376i3yEju+2wSOYU+9VmVjmvVk6XMI5Lk8qy6it X-Received: by 10.223.135.77 with SMTP id 13mr32894531wrz.142.1511745188422; Sun, 26 Nov 2017 17:13:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511745188; cv=none; d=google.com; s=arc-20160816; b=ZvFRE6VJvx6ZbjbglbD0w6Jq24fJ6k2k/OKvkpQf+jd2aeVfvRi+AftObpbLb3ZaUJ p+A+IxYk4yAJiaQyFwMudIwUcLxlP0BJS8jUvHyaJf1iIJu10lLXigcZ8FN3h0voqdA/ ZVbqVj5P2LcVZjqcTSqWfl2Xbcxsg+zCxU2+sMOv6fzciuj89k4v7Z5dqXX1dFwQ64b+ mTIyvR+Bp9S5T4V49rJdzbHlSuXfGjhbVyLKEiGf8Na7pS4A/6Nxe5T6ZKPj5a4Brku4 gu23FSWYZaE5jY0x774QqVnS0yvlYwECBin6XCwsg8tulii154tJPhFdYIAdaXwewveX 57gA== 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=RhgBnNAaDVU0Eux2S0NgwDjXdoSWaOvV7wq0j3GToKY=; b=HoBFMFx9hdbEB7YTeW+D4RFVs4fm/GzuQmWfNepedgYCisXHmecq6H17pdOK5u3WGS PWwBN+FLVFotLkZVPlfavJUzNjuTipjaEXOlWtO6Vby4t6rEizIySLbKHROm/fjHwDa1 /CzoOrxoGg5v3cdsP6oqEGGWZrLtpYYTzrWp38NJRQBM8CXhzGRb717f8p97auMPIy0f VArNo8LtN0zI3pH368OrdgsWmksstPTFkVYmEYJ4TmQnMToWoXU8av35jskfWrJ8GROA jXyZAcfv409CBhXULO6IS44nifOU3QxfgILBDT098bhgq/gNYh+Bs2Zucs3c/gOUkrfq zeqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b=VV1Zb28y; 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 x21si1494339wrd.550.2017.11.26.17.13.08; Sun, 26 Nov 2017 17:13:08 -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=VV1Zb28y; 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 74733689FC6; Mon, 27 Nov 2017 03:13:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-13.163.com (m12-13.163.com [220.181.12.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D69A689DEA for ; Mon, 27 Nov 2017 03:12:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=4u6CeffBo0IeHZ2RhE 10TUsbVaU4R8fomJoLEWj08YE=; b=VV1Zb28yu4B8/MfvXcJ91jw8svoubTYMMt M/eGUXvZFGcaIIPgVvbiAeka78synHGMHNpfArgoauZy+y571VZRCNJiaQ0arYU9 VjfL1dSLKBnC5F1xPG+JetP77GQiw58nKGSDxhF5YjNWcXn6hjvzBbX0Xm+G793Z 4XGIgCcXs= Received: from localhost.localdomain (unknown [106.120.213.112]) by smtp9 (Coremail) with SMTP id DcCowADX8uSXZhtawlnHBQ--.42639S3; Mon, 27 Nov 2017 09:12:57 +0800 (CST) From: Pan Bian To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 09:12:54 +0800 Message-Id: <1511745174-22013-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: DcCowADX8uSXZhtawlnHBQ--.42639S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7JF1kCr4kJr1ruFWrWr47CFg_yoWfAFc_K3 43XF97XrW5A3srWrs7KF4UXrZ7G3yrArn7J3yqqryfuw4Fva1vvr1kJr9xZ3WfCryxXr9r t39Y9w13Wr1I9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU1Vc_PUUUUU== X-Originating-IP: [106.120.213.112] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/1tbiVBqdclUMCYSpFQAAsJ Subject: [FFmpeg-devel] ffmpeg: Check read_ffserver_streams() 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_alloc_context() will return a NULL pointer on failure. However, in function read_ffserver_streams(), its return value is not validated and the subsequent dereference may result in a bad memory access bug. Check its return value against NULL and avoid potential NULL dereference. Signed-off-by: Pan Bian --- fftools/ffmpeg_opt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 9445a2d..7e51c5a 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2000,6 +2000,8 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch { int i, err; AVFormatContext *ic = avformat_alloc_context(); + if (!ic) + return AVERROR(ENOMEM); ic->interrupt_callback = int_cb; err = avformat_open_input(&ic, filename, NULL, NULL);