From patchwork Sun Mar 29 04:14:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18481 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 E4432449DA4 for ; Sun, 29 Mar 2020 07:14:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7ACC68B664; Sun, 29 Mar 2020 07:14:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCD6768B1B1 for ; Sun, 29 Mar 2020 07:14:45 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id c187so16116161wme.1 for ; Sat, 28 Mar 2020 21:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cOwHoQIfn6x830bU9W05aKInk0+efXq6Ls+O1KrvcPE=; b=uZniT2Wwta3umenjvJyDuzOsrWcdjx7xfkUy9HQr9wn3FmUSNuAmrHLM11MIKqRvEq T3nDpx5UgK7k1jEw8Y+j+TACTIx8oLmcTMPnxv64EDIqCSoMuhir+0cJHic7XkF5uJ9+ jKM4LrhKa94fZYsOSqpbqobGGf+wDWQBS4X9VmAMIQYH6WfQ+BQxLSsAmIgOrNDWQC/j pZdfdlyhJjI6qU50uoQ2kN9VHECa896frLT1dunN2/34fygMOQz4eF9ct/4FmcHMVP/G Mj6XMofG2W+N+1j+xIpHPtE4L7ILZgbJdBo9uWm905P/v0WDxTgkgEvs7etZIhHEy4+I E9vw== 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:mime-version :content-transfer-encoding; bh=cOwHoQIfn6x830bU9W05aKInk0+efXq6Ls+O1KrvcPE=; b=gkoMSpx9mEAomoiCSB1v7C2d8G4a8g1ows2Jj/56Da+vuRR1ytWxQmztXzOaRD+mJN wvrKOLndaUOtVIhGND5c7sJUKZ/440o4RYZE/3GvzRKXRZz1Wx9RVpn63s1jmoUnM0UA 558WPtStQdZ7n9Adh7IT0Ss3u+NVjgsBaUnJ3j3WFZ9xCFthwVv9h6eLkXcDpikbEhwB /TsYMNCa9FrrTdYOJ3IwjCAfxmzQ7IcEbcE60mIbu1A34/6URI8FGMx788o9T0qjBTe1 GBHuB0KW5e6SqVyyjEpZTKFncoJqt24RAzsIfEXlBVtlxt0iSPvNjPcNQiCid97sZFqN Ydpg== X-Gm-Message-State: ANhLgQ2ExyOTmAWc4ta3AmvaRvhiuJyrmKFH05Nqs+MAgplAWlQbqXEb +H3VR22oIuo3/t4JynT1T3wd0atn X-Google-Smtp-Source: ADFU+vskAN7mpkPTH6Sg+1i/2IYxGhZnSu0dP0udsCLqheD7IVsMuhYlzb3brz6mpN+uvEMxZVasNA== X-Received: by 2002:a1c:9803:: with SMTP id a3mr6681235wme.30.1585455284682; Sat, 28 Mar 2020 21:14:44 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id n124sm14387026wma.11.2020.03.28.21.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2020 21:14:44 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Mar 2020 06:14:37 +0200 Message-Id: <20200329041438.7815-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/opt: Don't use NULL for %s string in a log message 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If one calls av_opt_set() with an incorrect string to set the value of an option of type AV_OPT_TYPE_VIDEO_RATE, the given string is used in a log message via %s. This also happens when the string is actually a nullpointer in which case using it for %s is forbidden. This commit changes this by erroring out early in case of a nullpointer. This also fixes a warning from GCC 9.2: "ā€˜%sā€™ directive argument is null [-Wformat-overflow=]" Signed-off-by: Andreas Rheinhardt --- There are two places that call set_string_video_rate(): av_opt_set() and av_opt_set_defaults2(). This patch makes sure that av_opt_set() can't call set_string_video_rate() with a NULL string. All AV_OPT_TYPE_VIDEO_RATE options in the FFmpeg codebase have a default value different than NULL and so I deemed a check in the av_opt_set_defaults2() codepath to be unnecessary. But others might have a different opinion on this. libavutil/opt.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index a482febf5f..bf2562737b 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -330,12 +330,7 @@ static int set_string_image_size(void *obj, const AVOption *o, const char *val, static int set_string_video_rate(void *obj, const AVOption *o, const char *val, AVRational *dst) { - int ret; - if (!val) { - ret = AVERROR(EINVAL); - } else { - ret = av_parse_video_rate(dst, val); - } + int ret = av_parse_video_rate(dst, val); if (ret < 0) av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as video rate\n", val); return ret; @@ -473,7 +468,7 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) return AVERROR_OPTION_NOT_FOUND; if (!val && (o->type != AV_OPT_TYPE_STRING && o->type != AV_OPT_TYPE_PIXEL_FMT && o->type != AV_OPT_TYPE_SAMPLE_FMT && - o->type != AV_OPT_TYPE_IMAGE_SIZE && o->type != AV_OPT_TYPE_VIDEO_RATE && + o->type != AV_OPT_TYPE_IMAGE_SIZE && o->type != AV_OPT_TYPE_DURATION && o->type != AV_OPT_TYPE_COLOR && o->type != AV_OPT_TYPE_CHANNEL_LAYOUT && o->type != AV_OPT_TYPE_BOOL)) return AVERROR(EINVAL);