From patchwork Thu Oct 14 13:08:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31110 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp7145283ioa; Thu, 14 Oct 2021 06:09:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1Qm7TNaTobHmCyemGteNxKV7gVjiwZ3NfV7CGSvcTccclEZKvf+Mrl2V9M0/FPdorOKk9 X-Received: by 2002:a50:cfcb:: with SMTP id i11mr8494041edk.347.1634216995142; Thu, 14 Oct 2021 06:09:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634216995; cv=none; d=google.com; s=arc-20160816; b=IX7gDfbEg30Sn6TIjFlPUGrmKWfgHLJ2XVZDHtsaSYcopF8zQhEW7Z3dijm4fq16or y65ZBnAo+1WICgSMOwLOvQJMayOepii/2JoIsAKb/GDjx7h0Lirutgxa4qP7aAQfwVNd hN+D1QR8mqRJD+RXAOpiJIT6ehxMv3cMV37jr/YgTNkvvH52SLZsFx81Pv9+mN5bUXzo yh870FrnRrMYwVbXevD9vARoUKjs8ROdL1zjBavXDq+0YCAaIujOoj4CgD8J4O+TrUff +q9iJU3CcQpVabT52dPiyTmurj1xOoQop+BM6RrxyxXZl5ubSViD30wirTTejiGFoFPO c4ag== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=pQP1/GIAYVVYjVyPAzqRQS2li6oQxssodRVuR5woZcQ=; b=p8iyn5JibJEsrklZfcMY4XPWvbzR16tKiaEMEePrCIcEXjhcymZtbZB0PYaDgLkI+g Fl08CBM0hODNmVCuV3C9rHCLzsg5NKiLCb+SJEyTltSlkfv+jtWXfreHxkfnq+LlJp8R jmV3Mxf9/NlOx3qEcgCX+RaurIi3yz9XuuKwS01hKBLZtO9IBug1+9lp4lKjKQ0lWmeH fH5+Cnpu2Q+6it88Zi4wRwJhhS8ZlF0ujqF44Sb/vvxnnBhtPZlmTh4TGK8MccVv9PA+ T5tKHha+KmluwgXHB8FIFwZEQutiatbss2rb+p1TGiByUA8WYkZ2CwgH3swvS4A5lpxK 9krA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DUuRq6rY; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f4si3617568edr.20.2021.10.14.06.09.54; Thu, 14 Oct 2021 06:09:55 -0700 (PDT) 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 header.s=20210112 header.b=DUuRq6rY; 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 sp=QUARANTINE 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 589CE68AA3E; Thu, 14 Oct 2021 16:09:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A81268818E for ; Thu, 14 Oct 2021 16:09:14 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id q19so5423225pfl.4 for ; Thu, 14 Oct 2021 06:09:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LoAFE63y5oLP9+ASpEqX1f0i1Ez8j62NDMMrrlKTpKc=; b=DUuRq6rY8k7k7Cn8Z45yWhCNja0HjqPcu/KgbL0hwnPDnWNLWMx1H2NQvhN0BICPS7 mwee/NZa6ykYtrOg+W2QEgaNqmrPgsE+or8WKIvHHjbtu56GRuFfb1BYELHdH4BmC5G2 Kre5PkxZoDw/PAC2Zg3Yda5hN6x5Y/1F8U88Xxc7JMEi/zhGaSo3zY4QqgKHxkry1PA2 ipEt2SV5PlxV0LPC1Ci3CDC6MxuUZ4TqRejNjEpkP0L16vuCWjaX/WEF7qKMxX8gErbZ xUHB3taOMCjLQCQFws7fxqw5EDTyoOWIP2whkb7p2h+IArekRBa4limoSviI6ezadIRe cF0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LoAFE63y5oLP9+ASpEqX1f0i1Ez8j62NDMMrrlKTpKc=; b=ceMfyKOk/PbzUNqdCMd7fnIroXpmeITtZbUHQqaLHkM8gRfFTalLVsrZz4im/5Aw/s rVX/By+7MLvakjhSfjFZ4UQOZkb+St74vIJo6UAPP1T1/MxuDZAfXHdylS1kCzl2aWo2 zNxgyqfEdpB3TegBUN48RRBuCJQoJcKmGQny/IPm8PPa2hhSb0OwgEcVp0Yblr0JqD4c 6rG6rdTisXFzaT3l2uC47GQaPCWnAXqwe6Ea6pWYpIKTDsKelik8KA3giCVRYy0HsCZt gWnUdNVUZN5nt3GQzVgFwUsd2iv+/JzPaOtH+Fddp9fAFMmqkeJbLzkB8wpSgWEbNa24 X8lw== X-Gm-Message-State: AOAM532fixQh4p1ZkPSviwTssXCr2nwlqkw4moEiksFNPhnJztTmRCFC ccjs+Izl2v3hy/UJxgNizbRdjo60C3M= X-Received: by 2002:a63:4917:: with SMTP id w23mr4131756pga.344.1634216952259; Thu, 14 Oct 2021 06:09:12 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 66sm2504789pfu.185.2021.10.14.06.09.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Oct 2021 06:09:11 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Oct 2021 21:08:58 +0800 Message-Id: <1634216942-20329-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1634216942-20329-1-git-send-email-lance.lmwang@gmail.com> References: <1634216942-20329-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/8] avcodec/atsc_a53: use AVERROR_INVALIDDATA X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qJxl7r6cJaD2 From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/atsc_a53.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/atsc_a53.c b/libavcodec/atsc_a53.c index 2d89ef5..29ec71b 100644 --- a/libavcodec/atsc_a53.c +++ b/libavcodec/atsc_a53.c @@ -73,7 +73,7 @@ int ff_parse_a53_cc(AVBufferRef **pbuf, const uint8_t *data, int size) int ret, cc_count; if (size < 3) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; ret = init_get_bits8(&gb, data, size); if (ret < 0) @@ -95,12 +95,12 @@ int ff_parse_a53_cc(AVBufferRef **pbuf, const uint8_t *data, int size) /* 3 bytes per CC plus one byte marker_bits at the end */ if (cc_count * 3 >= (get_bits_left(&gb) >> 3)) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; new_size = (old_size + cc_count * 3); if (new_size > INT_MAX) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; /* Allow merging of the cc data from two fields. */ ret = av_buffer_realloc(pbuf, new_size);