From patchwork Fri Jul 31 14:53:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Haughton X-Patchwork-Id: 21410 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 143C5449458 for ; Fri, 31 Jul 2020 17:54:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D86F668B7E6; Fri, 31 Jul 2020 17:54:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5306E68B6C2 for ; Fri, 31 Jul 2020 17:54:05 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id 9so8749355wmj.5 for ; Fri, 31 Jul 2020 07:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=3E2BU5JZZsKu4TlzKIH3rYkcbXVRHHS+ugzSFVjBVC8=; b=cyca1GohJiACx0M6kQDKzC9Skg7q74Y8fIBw9vlRHPsP+G4AcA5mB2L0FsXDujZoqc fEwy5iFv6exgUfMMSvBrqvxO/kYAjOMc2TnJ8JCaHHeOvBqqZ6iSp/UsUV6DgpRpIcX9 iI1GUlueYJzBie/B8DAjuuMXdGBdEUsXE5QIk= 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=3E2BU5JZZsKu4TlzKIH3rYkcbXVRHHS+ugzSFVjBVC8=; b=hGfIvuiGUYmpSXdGhs8J5G22KZ+jdfrfc3PXDsuD3p99JsKfp2GwZOA/qTucQh+eaf TqFPbt6Lg0Am2TN03XgxRyWPdubaQxpCnBtbPKWSAWbwt+7J4JWmh+LLpuEisDWDw7zg juIWHLe9SE5Dv5+P3lNg7UBHZ/pzPQhophxT/jLweHI7RkG5tQ6FKuoUzHSIfipW1+IH gFkv1W9bGpTP7XLqQCd4GsBuOJEADnEMNTzPJQSvr3tGxWV+cM0vLDVG/El0azsG9Bqa hSoJTRWH+EfeqLRbUSIT9wf2h/WHdgL0k/d1Bjjel9m7H0oArJYE0gN/SZhwt7EMFBHp LI/A== X-Gm-Message-State: AOAM531UfTHMaj7zYjNIwHsz7WkDsGRpNj8FN4PlYlLuZyCruS0UQZYp iJbFfoy7/e3PgJQ9+YCVMPs0K3aI2jLKl/nfJ0ifTWqjILHHbc8rmpcqEcZC1I4KhgzmeOpDa/n AbJtbvkCFZCKhoyfbjONODeImAea0cZ3Qzv+DFlPPb6L5g5mN2io/C7smwOpV3u1U+JKLAZINLV SYVQ== X-Google-Smtp-Source: ABdhPJxVvvvT+WDZQQALDWv1R4RZhTqZnyouYYpKNXt+x5RQ8IanQuzGzcejq0kUc83oiYY1Yl3o0Q== X-Received: by 2002:a1c:818e:: with SMTP id c136mr4384102wmd.170.1596207244326; Fri, 31 Jul 2020 07:54:04 -0700 (PDT) Received: from plutus.argon.design (107.166.17.46.bridgefibre.net. [46.17.166.107]) by smtp.gmail.com with ESMTPSA id 128sm13139771wmz.43.2020.07.31.07.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 07:54:03 -0700 (PDT) From: Jack Haughton To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Jul 2020 15:53:56 +0100 Message-Id: <20200731145356.7763-1-jack.haughton@broadcom.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avutil/opt: Restore NULL input handling to set_string_video_rate() 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: Jack Haughton MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Commit a500b975 removed NULL input handling from this function, moving the check higher up the call tree in one branch. However, there is another call to set_string_video_rate() which may pass NULL, and future users of the function may not be clear that a NULL check is required. This patch restores the NULL check to avoid these problems. --- libavutil/opt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index c8413fa5e1..9f36dc89a9 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -333,7 +333,13 @@ 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 = av_parse_video_rate(dst, val); + int ret; + + if (!val) { + av_log(obj, AV_LOG_ERROR, "NULL passed as video rate\n"); + return AVERROR(EINVAL); + } + 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;