From patchwork Tue Mar 26 02:59:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 47483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1564674pzb; Mon, 25 Mar 2024 19:59:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWlwQDa/GbbIXbv3ykUpubThW4Mtr/fL09ibyRAdSBlF4ne55tcqMPlNljwtdwM9AOxrUDM55TV7ZaBwdvP2RJXbdM+WYNLWBdC2Q== X-Google-Smtp-Source: AGHT+IEnyB0UQzW1gU9uQVsyVTyKSorcqPEFl1OVwJw+NnPCpMSLm1mHaH5PYyBREG2NXZR3g89C X-Received: by 2002:a50:d654:0:b0:568:4b96:36d2 with SMTP id c20-20020a50d654000000b005684b9636d2mr5749202edj.2.1711421961718; Mon, 25 Mar 2024 19:59:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711421961; cv=none; d=google.com; s=arc-20160816; b=iTRSZoisvwpd6Une7aqgtpod39GAUKeluUQfknmX3YA42ZXr1pGMAGPMIBtgFiobvk 2NQddFWn84cQE7lk4rkLg0K9yGTtOk7H55Gy80Woa4dlIus+8cMGCPXS44jHc4RkePm4 TbolSMsQ1vWCSQi43ZzJzflCLU5BuTxPliMYm+YOmKpTM1GX1LwibiDZj8cWn9lCM1Ye X7u6Mkw3c8IOLORkYEOSfM+PodqfAXKFHqkuYszlvofkkoSgjT4TBJ/aiWDuYKUnqiOX hI3HpC0BFLjkhBipt5xy1Bf4p03dTt17cKlI2qYThXAOQ97Uj3B13++a/P//isKjBKnT HHFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=E3CrHJ8dlYTB1S9R/OcerXo9jMcLZ5QuiCwPoUT7CMs=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=pNMAqGTYmsirddxdmiI5D6bu41O3Tdlc6tfUkbq5Ma9zBbOw2jeKaJsAaOr+QBNHX2 fB1jVhe/QKbD1ciuTvHLpP/R3bLFrDBPTASj3Dlpp82ftiU6T2phQ2pLeu9qPcXumkyL BnlhBQfWfr32cdo1bQeSAy/4X3CWvDe1p07lHr8xPbOv36R1t09K+KGGwrseQsCq4Qoj COwGW4B4ybRAEYOV7Aueb8M89RXeAEp5YIW2GTEPVCr15GDhimdldwM6n1sWf+Tskm0p Jx0Ihecef7JfvLYKFm6/6Ukvqp8jzGKc34SQgcD3eupKggCXfQ4ZFLikVPCJfWr/wlrG zfGw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=w+LDY5OD; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds11-20020a0564021ccb00b0056c1cc26f71si754721edb.280.2024.03.25.19.59.21; Mon, 25 Mar 2024 19:59:21 -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=@foxmail.com header.s=s201512 header.b=w+LDY5OD; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3637368D5D9; Tue, 26 Mar 2024 04:59:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28D4068D523 for ; Tue, 26 Mar 2024 04:59:09 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1711421940; bh=ly+aCObxDP6y2zkv5Jt1nkeTAxln7TGTuHVLL6ffnhQ=; h=From:To:Cc:Subject:Date; b=w+LDY5ODc5Jt60aDoFv5NBIYs7mNDy/wJ+h+GBo3eNDkk8BLaJLBSnfOABIL9sa0/ VnSnSB1FlhVWXGsnc9NTbShRH8SVWbQtWrJ6tuIOjYJzZikRv0qnWL4XLtxcKQUcyC 2kYbIp340KSSdAiDvekbQA1raYuxcK9mIAojKSyY= Received: from localhost.localdomain ([119.147.10.187]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id EBB8C8EF; Tue, 26 Mar 2024 10:58:59 +0800 X-QQ-mid: xmsmtpt1711421939txqlvecbb Message-ID: X-QQ-XMAILINFO: MPEorwW6cFo9h+sXpRkYrO+WpklzCXz719Vl+WZMRKRkRbCZItq1twngnEdKpz hxE7uJs+sT/78oZMDoM5jDMSnv0y7JsmAHLAQJGE7c8xOuwL6N1cyu4bZ56x9llyNO5mqldMTQEX Xy1GdXx7U7nw3FeOwrHiwIe5G/W812nWD2KOUOa/ZTZedqDdr1OCKz4wbBDoKnpWiGQLQoK3VS+F uP+oVy8y6a2AzB4l8lF3mjAbtFYYYNjso2OMgZL7JFjcf3cFv3FYh/AO/M/vxd4XOobRRlP161m+ TCpOcKpw1Iv2EFmjUxHOQBZxMG7VOt0YCLNLxkcrz+rabdJdxaSq9UUtLgRLh4mQHgQCO32P+/Ro DY81HiRS9iTYGCUoetv+F+GlZ/BNR1c++JJ+lvvM5L6AGjUjqylfKK6IDRSV3lDgmfDYI4j/kPLN PvZ8Fgk3kiZR1BWTxOfzjQQZDOjEibHheTBsVqY7QLw1ErSGW6hknFMXnAHn82A4tDudQf5pPuTz gGVOcpMfMuvBscmvltRvRnpgaMRtgK/2GlcJSN8Qs10HxdwtFXDQFZrUPEKORXwwR5MKPChS4WO9 GFi9zyV8BTB0bRkgrgB3hVXYKA/hy0VyWsEYCA23SDikZQ/Tz+Y6tizSoqzVY/zCs2JPqcvYv+sp Ek6qQW1D03BCsJdWU0MYkVSZOaEjURSxVvcm5jGRxBer9ZLhhoI0X8ui8LgvTe/YYuH+4Tb+vyiu qUUGe3fHc6fx5hAVIUcgD2BAFn6KY0PSPe2KNAHIlxvHU2jgzuaUwNfwh8sqkrCCnStJLusOecpy vIdtSn/DrLoEOiNZGq1o0QIPyI9OMZd32FPlKzeOAmyGQWWERo/4qRiicMVns7HF64HHao6tQa9r jd9K2aEjvx+U0kfEoB7Q8IKbY6TANJ+We8iyiVBOmHXqO5HNO/Lp1iHANunttFdlnTSwOXpDDpq+ BjBZ7MuTGbl4odmAA16RTqmwAeAGUcN5Vwdb6yltKT1jYh0xy0mw== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Mar 2024 10:59:00 +0800 X-OQ-MSGID: <20240326025900.880689-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_parse: Fix error code in decode_extradata 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zkVz7djo4Iq3 From: Zhao Zhili --- libavcodec/h264_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 3378650fd5..09d3b9dc05 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -468,7 +468,7 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps, int ret; if (!data || size <= 0) - return -1; + return AVERROR(EINVAL); if (data[0] == 1) { int i, cnt, nalsize;