From patchwork Thu Nov 17 11:12:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 1454 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp701921vsb; Thu, 17 Nov 2016 03:20:07 -0800 (PST) X-Received: by 10.194.47.138 with SMTP id d10mr1961577wjn.83.1479381606945; Thu, 17 Nov 2016 03:20:06 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wn4si2341056wjb.27.2016.11.17.03.20.06; Thu, 17 Nov 2016 03:20:06 -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=@gmail.com; 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 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 27155689EFA; Thu, 17 Nov 2016 13:20:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7093B689E06 for ; Thu, 17 Nov 2016 13:19:57 +0200 (EET) Received: by mail-wm0-f42.google.com with SMTP id g23so304007597wme.1 for ; Thu, 17 Nov 2016 03:19:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=WlLktPghtVkev7JK77h/S90wmxpNV3NvYhY/L/lAn5w=; b=UNgqhB6T1FAnU4bLFW1TddctnLgT+0F8DoQtXAP6AdvsA+jWeO+t8DuBnZNJHdThdz ONaVK4vaTN5tHRRoMoNMJozA2Enf77oCgfOD0wbZb8Uf2aKdW+4WjfFb01EOP7+zEd8c 7wygqsY6IETqQ3/GOOlj5Hwhva0fZ0d9h3EkHaD6lKqY4Lg1BPIp34YVU/yr4z5l3RV9 swxB3Qk6iMfc4z1nPNNbqvs5o+hTvDTDALe67NqzreUAt/mnoxLWcen82GoHIHSptX5n uBHB7yV6/pi6QduZF13uriXJGCYuuQ9+w+nhnhs9yOV17hqeuTwh+oqLPSOAwux5RNyQ EhYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WlLktPghtVkev7JK77h/S90wmxpNV3NvYhY/L/lAn5w=; b=m/5kPsNj0wOsNmfXipxSggu+CYmmWq7csqRbZSgPqjRQT6KdZmqfrM93/lY7gyS5bK GoeXAoN5U9KUZvKPHD3B9FbyV0pa06YOHKeqhsjRZX9LwHiUck7Bt4WoNor3bN6G4Edf qeWqZoHKeBijc1S78L3u4tyxHzziKca+WQKyjLpZdS/1cucrj+m9WIjiAYzNevs1VaTR BxxoIxClRuELq9mk0ica197EtHedVR6b5IQvlv6SOfPa8ssI5+GOA/Dqn4X6G6bWy+lS 0pQSTyol88nn7XO3L4Hu9QW3MWDcOjfAsNoNeVVTJwYoM69cZam6PYLYwLWn5J1d9hjX Bsnw== X-Gm-Message-State: AKaTC01tOqEsIgu+JTVsrjCNsGt9bqouoEy51DzKDaAKBOxVFzBfK8wlrNh2vDnWUu6nhw== X-Received: by 10.28.144.70 with SMTP id s67mr3288979wmd.138.1479381179418; Thu, 17 Nov 2016 03:12:59 -0800 (PST) Received: from barisone ([151.56.145.10]) by smtp.gmail.com with ESMTPSA id bj1sm2691332wjc.17.2016.11.17.03.12.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 03:12:58 -0800 (PST) Received: by barisone (Postfix, from userid 1000) id 58AC01A8978; Thu, 17 Nov 2016 12:12:55 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Thu, 17 Nov 2016 12:12:55 +0100 Message-Id: <1479381175-15460-1-git-send-email-stefasab@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH] ffprobe: fix crash in case -of is specified with an empty string 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: Stefano Sabatini MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fix trac issue #5957. --- ffprobe.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ffprobe.c b/ffprobe.c index a2980b3..79fe296 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -3311,6 +3311,12 @@ int main(int argc, char **argv) goto end; } w_name = av_strtok(print_format, "=", &buf); + if (!w_name) { + av_log(NULL, AV_LOG_ERROR, + "No name specified for the output format\n"); + ret = AVERROR(EINVAL); + goto end; + } w_args = buf; if (show_data_hash) {