From patchwork Thu Jan 30 14:03:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17624 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 466B8447FFA for ; Thu, 30 Jan 2020 16:09:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2382E68ADB0; Thu, 30 Jan 2020 16:09:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A44B568980E for ; Thu, 30 Jan 2020 16:09:25 +0200 (EET) Received: by mail-pf1-f193.google.com with SMTP id 2so1537016pfg.12 for ; Thu, 30 Jan 2020 06:09:25 -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; bh=Cz+IOCq6pbWEWbLQ8ucYBw/7T9HkTdQFlUC7ft9zETY=; b=qBOHqbgE8aftnrujBrFRlvPDV8uQKlOUQPll3gk030iTtpnnGgZFzlAV5z+H2xNKEh 3YYZvr/j8d9oJFkY9/EbEIIorfWrSe+IluPaiLd3pqNGr17gbH07+/OogTALc31PBLNu ioZwPbAKnYqEmPqc3aqLtap92DUwpeZIClAhemQRLaYmWHgyqdMlmsKZ2Se+LhbcBC74 ncNC5vBtWlE5VeSezkKekvGv4LcCbHTlLD9+Y0K5ZhY4JfUYYdfXm0Rg1XAMvu8aGoXk p/+CkyhlcxeOJxdL+VJDRzI2+Y9G7o0jEd+5rJhesBZ2ZdN5cnmRfYRA8HrI6OeUM3Ib FMEw== 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; bh=Cz+IOCq6pbWEWbLQ8ucYBw/7T9HkTdQFlUC7ft9zETY=; b=FX9N50kW/KdwGg+g2YaSj8IXTCAC1nJ/Uji24TaRmZt2RhS1fYz72jclqoIv9VNEU2 kQlwUKTAQutj8SqUdNdJaoBzvf9s3hnzZE8OR1kIt45LS8yBE5w/a4epjS/2Eq4l5ZQi iU4V7Hk/bei/K3ojFnbWvKE0Tw/I58bfK56T3aDMG02HWRMD29vrFknqbQ6WKF9Q3uh8 c1vsdbi8aJllUedX58L/N/8nt3xnaa6SgDw4scsv0JZ5+hMB65AyuteMAoqMgR2REaT0 MMrf+/PPtjfBcRwEOIaZKPdyTSYxR61V+I4C7Fa0lyxRWU9g6LbV/XGaXizYu1NIftXE 45lg== X-Gm-Message-State: APjAAAU8TvBBT5iXap0EkG7MF9C5E8E6OTCPep6ElGE5C3V5l5ToLwE0 LweifYHGahLKUr9HKuRjeUf+TKOk X-Google-Smtp-Source: APXvYqyik/GJ6mZCo5c0RioZxBnlwjETEGEwIRWbOVeBrxW7nu6Yd0Hvbed8BWudYlqp/j9j8YZn8Q== X-Received: by 2002:a62:3304:: with SMTP id z4mr4942710pfz.79.1580393003933; Thu, 30 Jan 2020 06:03:23 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id n188sm6438330pga.84.2020.01.30.06.03.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jan 2020 06:03:23 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jan 2020 22:03:17 +0800 Message-Id: <1580392997-12703-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1] cmdutils: fix crash if no name for "ffmpeg -h protocol" 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix crash when used the command like: - ffmpeg -h protocol - ffmpeg -h protocol= Signed-off-by: Jun Zhao --- fftools/cmdutils.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 2284631..f0f2b4f 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1872,8 +1872,14 @@ static void show_help_demuxer(const char *name) static void show_help_protocol(const char *name) { - const AVClass *proto_class = avio_protocol_get_class(name); + const AVClass *proto_class; + if (!name) { + av_log(NULL, AV_LOG_ERROR, "No protocol name specified.\n"); + return; + } + + proto_class = avio_protocol_get_class(name); if (!proto_class) { av_log(NULL, AV_LOG_ERROR, "Unknown protocol '%s'.\n", name); return;