From patchwork Mon Jun 22 15:24:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20556 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 58BF244BD02 for ; Mon, 22 Jun 2020 18:30:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E79B68B904; Mon, 22 Jun 2020 18:30:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2C5168B8F5 for ; Mon, 22 Jun 2020 18:30:32 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id d67so15950242oig.6 for ; Mon, 22 Jun 2020 08:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sW9BKdoGJ3USKlVUQqM3I7Iao+iinkI7uBSbaNYalbA=; b=q5rT2y5Rsvg1ZZ+yQzm2VJnUPhwO1ZK26jjOUL+TkwDG75Ad8sR6jvI/15pURA9Doh xb/RVJm/V3WESrF2tlkJ1Ge2VhQSYbSzI1ocXEqDe6srbASs7O6AgqDkSUJ+uKwOY5Aw sSwqfL/SgwTq9dzQytKsnVzs+DaQ/w3/0cnsvDZGnuGtfuB7RofqD64/+EYYIZz1buNv GldXSSur9cp7Jms20MS0EUhWvtt2nvM1mv0XmISZTR8eSk4j9K7lWWvpkQkbhQLSlwTb hWK+nqSfaS0psRYB50atAAkU5qHe0UxzcBCoomhHbueyzFNsmBjglVWwuJ59LLHQ9xa5 /cbA== 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:in-reply-to :references; bh=sW9BKdoGJ3USKlVUQqM3I7Iao+iinkI7uBSbaNYalbA=; b=V+YpQGBjuuHoEYYrgndWs+AtTCxBMUaTP3EqLsYObhsZzF30hdL5YeqKhOBR6zQPtZ xS+ToWVfnQjYbVGsN3G9heR6ueFZcvXyDtChMiMspn1AXJrpPVWDSpTQrjEbmd7upK7u jqMGId8X9KSZYKkCdX54iSiFG1r4KmcCtRnnqE0cDpYq5GdURHflStxPaKDL2OmyIUcx 9LIeVIDLltjvmrcs7Te2wjaGXmHxtbugxXDdWgcUUCqfM+GfzPlCAbHtyNrkhyt7Z76a oPPiQKyEyBlJ1+KAZ6LXe6o2YCk1CCfv4TqDJvoD9h5dwqd6xGsm3QsCBNd0/xUhQ9hC gkaQ== X-Gm-Message-State: AOAM533iKueT9oex1+n2N9bNLTwWFLB+I0ePovleyYNlT10GVMW13Qsa D7ZaAQruMG1KW1EyLBM9pUUf2qTq X-Google-Smtp-Source: ABdhPJwbcsLzf28bAkI6NTxQDxovKq4Yucer0cwb9fwN16eiEHQzTWDtitjxleYr0LJ5mtCYjlB9CA== X-Received: by 2002:a17:90b:e89:: with SMTP id fv9mr18644642pjb.131.1592839494485; Mon, 22 Jun 2020 08:24:54 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:54 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:32 +0800 Message-Id: <1592839474-2804-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/6] avformat/au: check return value of au_read_annotation() 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/au.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/au.c b/libavformat/au.c index ff9176a..b6df63e 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -145,6 +145,7 @@ static int au_read_header(AVFormatContext *s) int bps, ba = 0; enum AVCodecID codec; AVStream *st; + int ret; tag = avio_rl32(pb); if (tag != MKTAG('.', 's', 'n', 'd')) @@ -163,7 +164,8 @@ static int au_read_header(AVFormatContext *s) if (size > 24) { /* parse annotation field to get metadata */ - au_read_annotation(s, size - 24); + if (ret = au_read_annotation(s, size - 24) < 0) + return ret; } codec = ff_codec_get_id(codec_au_tags, id);