From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 056B342091 for ; Tue, 22 Feb 2022 07:50:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2F9768B02F; Tue, 22 Feb 2022 09:50:05 +0200 (EET) Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47346689EA6 for ; Tue, 22 Feb 2022 09:49:57 +0200 (EET) Received: from localhost.localdomain (unknown [124.16.138.126]) by APP-01 (Coremail) with SMTP id qwCowADHzfGilRRi9sNLAQ--.50866S2; Tue, 22 Feb 2022 15:49:55 +0800 (CST) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Feb 2022 15:49:53 +0800 Message-Id: <20220222074953.2788880-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: qwCowADHzfGilRRi9sNLAQ--.50866S2 X-Coremail-Antispam: 1UD129KBjvdXoWrtw17WrWDGw13ZF4DWrWfXwb_yoWkZrb_AF n3Za17XFWq9rs7Z3Wjqw15Aw4rXwsYyF1Y9ayfXw4xJ34Sy34fZ34kWrs3Wr4rWr4FyFy3 GrZxAr97Gw1S9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbzxFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s 0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xII jxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr 1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48J MxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2 0xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4 v20xvaj40_Wr1j6rW3Jr1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x02 67AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbrMaUUUUUU== X-Originating-IP: [124.16.138.126] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Subject: [FFmpeg-devel] [PATCH] avformat: Add check for ff_get_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: Jiasheng Jiang Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: As the potential failure of the memory allocation, the ff_get_extradata() could return error if fails. Therefore, it should be better to deal with the return value of the ff_get_extradata() and return error if fails. Fixes: 2d720069a9 ("avformat: add aix demuxer") Signed-off-by: Jiasheng Jiang --- libavformat/aixdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/aixdec.c b/libavformat/aixdec.c index 59c3d60da3..89f73b6913 100644 --- a/libavformat/aixdec.c +++ b/libavformat/aixdec.c @@ -40,7 +40,7 @@ static int aix_read_header(AVFormatContext *s) unsigned segment_list_offset = 0x20; unsigned segment_list_entry_size = 0x10; unsigned size; - int i; + int i, ret; avio_skip(s->pb, 4); first_offset = avio_rb32(s->pb) + 8; @@ -77,7 +77,9 @@ static int aix_read_header(AVFormatContext *s) if (size <= 8) return AVERROR_INVALIDDATA; avio_skip(s->pb, 8); - ff_get_extradata(s, s->streams[i]->codecpar, s->pb, size - 8); + ret = ff_get_extradata(s, s->streams[i]->codecpar, s->pb, size - 8); + if (ret < 0) + return ret; } return 0; -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".