From patchwork Thu Oct 14 13:09:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp7146351ioa; Thu, 14 Oct 2021 06:10:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAAraPTnSAflU8osQ5onNtm+8TXKHwvQX3FgV0lIpVOVwbJzgDvOuYovNjjjPx9GK0LuJF X-Received: by 2002:a17:906:dc8:: with SMTP id p8mr3756396eji.167.1634217049187; Thu, 14 Oct 2021 06:10:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634217049; cv=none; d=google.com; s=arc-20160816; b=P4IpLG+zN5KTIWj1TWUB12rUTzY/4Crrrtmxyyv5++u4KDHfPvTHEtxoGgpd2QeaSL 87OC1oUWBfTd2JXxj35hD08YdrZHHI0TzkKlWCKZDH+e1Zmh/Xy8fVqOghsoMFT21VjK D+QSqlJeWSIb88Z4CUiyT76HMjqNx2wMb07tIGqOmBHX5A3oxigvboPkL8xyDo1xE1TF 1WOgJkEQ1fljsEqUZWTbI0UNgNCje1Q+85QXMbsZgjGr6VM8rKICYSu+ucdWHEZbNl/E TzqOa4QU6vHpKsTrC1XOUgDSRqIumwS85TzFqCJMMcPrinPF1bLCUe3q195jD6kd8PPO uPeQ== 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=gZdtGvEBPIWQi+TIzcrqekUt4aoBtbYnNRtLbmUz0es=; b=mGXuhWSGgG8ex+3J3kC3dtGQar5so/t1ZzTdmYqMGMOsohQvMePJMVhCxSGgYzgH6i YOJhzrYr7dZm3FGb/2iAkC4cwa+R0EGbFf+PKnp4N/FP1sVpHzrUAMJmtGbSES9MUHV9 6qJqDwvwqZhYjKPmgn4Ym4gtAV/ZVIhkvnNksu7kdw0WrT6vxj2oBr0/vt6AUzCMjAy+ G83jW0dtceq+Pfap6AuTPfVIJFhajPb5CvfWhO/ZWAraN7VFuknHlvrHO4EKUTNAXG0J nJl9pF/RTImknrk+MlYh7lsViGygu948n0DpMi7D9+D5F+1WcX7Gbp+c5LHBo9tWDsAP QdRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TDc4D9Dp; 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 l12si3450684ejx.146.2021.10.14.06.10.48; Thu, 14 Oct 2021 06:10:49 -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=TDc4D9Dp; 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 71EBD68AA42; Thu, 14 Oct 2021 16:09:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E98168AA3C for ; Thu, 14 Oct 2021 16:09:19 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id pf6-20020a17090b1d8600b0019fa884ab85so6905161pjb.5 for ; Thu, 14 Oct 2021 06:09:19 -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=PND8GIr9FfOqDAep22/pkHrf8c1AYVicZudzQOf/rBY=; b=TDc4D9DpEHgpEeV28vGKTesAgKxQ1krZcljDZN5gTsA0bqRw9+rvNnYx8TaknrU2cz Ki8QYRsDyloWs1Wnes3fRpnm9v+rCReSfy+N5E8f/Um7FoEN1jqkxn9hqOoV3tguBGbl uIQmk4rXbv6mo6/eie+gqzN+vFcihQ4OGTSZLY54teiRZvWVclOyXhl8R11PfNhJNRjs ICLO6BKBTzIgVg3ANtXFbBLJiVr+LkWoU+zdjC7OvSCRhtly0rqWfKfkGRzDOT2Uz1o5 Ad3sGwiy521n/k4A8DY0Vzh0li2NEiaRJ9HNcVX5EpXLfIZT/Xh8HQfpPReC80KgfH5K 1fIw== 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=PND8GIr9FfOqDAep22/pkHrf8c1AYVicZudzQOf/rBY=; b=J6WOTdNcZf+HQXtsDtaR5gxKMgakBnpBCSG4qTs0t1VIHNf2AZfZ1ylYCaOvMEHMXZ vOmHc+Z/MfY9++uoyaZ+TftyIqSqyFqFvcHHr0MKJNSdolMcOdH24Thp8oYI8gjYP67G JVJgKz3IEH7hnRhdmn+bAwEvvGxLBE64LPRQ+/tSGLjiscZUD+dXuGriSD7U84slZa7s S9tf+XznmSIZ9x8qUFUGc6lBbXr0NTCsVQUNdjci3CpxRGsf7actJltW+B4SXlX9o0Vc d1pnc6reJAak+sdO44lE0eEtugUGYyj0MV1YlUiepjzANy0tTxQMISrMBCB8D992KxP/ qYug== X-Gm-Message-State: AOAM530hjkdKwQGdiHXSSpoqvTuGxy5gZgNJw0/KcN0BstrntdQNld4I EK+dY3YN1HsNHPyQZ5wsoHyd43yvF8Y= X-Received: by 2002:a17:90a:9297:: with SMTP id n23mr20585824pjo.199.1634216957360; Thu, 14 Oct 2021 06:09:17 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 66sm2504789pfu.185.2021.10.14.06.09.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Oct 2021 06:09:17 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Oct 2021 21:09:02 +0800 Message-Id: <1634216942-20329-8-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 8/8] avformat/mpegts: return proper error codes 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: 4Qjz9AA0mhUc From: Limin Wang Signed-off-by: Limin Wang --- libavformat/mpegts.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 774964d..3157e3a 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2270,22 +2270,22 @@ static int parse_stream_identifier_desc(const uint8_t *p, const uint8_t *p_end) desc_list_len = get16(pp, p_end); if (desc_list_len < 0) - return -1; + return AVERROR_INVALIDDATA; desc_list_len &= 0xfff; desc_list_end = p + desc_list_len; if (desc_list_end > p_end) - return -1; + return AVERROR_INVALIDDATA; while (1) { desc_tag = get8(pp, desc_list_end); if (desc_tag < 0) - return -1; + return AVERROR_INVALIDDATA; desc_len = get8(pp, desc_list_end); if (desc_len < 0) - return -1; + return AVERROR_INVALIDDATA; desc_end = *pp + desc_len; if (desc_end > desc_list_end) - return -1; + return AVERROR_INVALIDDATA; if (desc_tag == 0x52) { return get8(pp, desc_end); @@ -2293,7 +2293,7 @@ static int parse_stream_identifier_desc(const uint8_t *p, const uint8_t *p_end) *pp = desc_end; } - return -1; + return AVERROR_INVALIDDATA; } static int is_pes_stream(int stream_type, uint32_t prog_reg_desc)