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 10AE545B52 for ; Tue, 20 Jun 2023 14:41:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 684F168C117; Tue, 20 Jun 2023 17:40:52 +0300 (EEST) Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EE2668C074 for ; Tue, 20 Jun 2023 17:40:46 +0300 (EEST) Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-1a9a2724a62so4308858fac.2 for ; Tue, 20 Jun 2023 07:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687272045; x=1689864045; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MAgAO3SChxYdAJy695y2hEJS0ndqqGZpw7Nt6AWvpVg=; b=D7ScE8S2rdhmVV+muHzf/EveH8vB1wznassctar36oTTeFvW02uYuOlc/gbwxW69H6 hWSwS0b5h9Y461yeNWO036upI8QADzLfIVgO98rZAodHhQAU66FCkim/lj+ydJFmDTqW 5Ic11PVI1QJtGsJ1/eV1Tjkm2nplX4YjoI7RWEikRFDdIQi0Y4IJ/Ni/kLJw/TQRu4n0 z8QvqmuODuKhI/JtR8lzJdd9Jzl3uJAzNa/JFI2HjROwuScL2O5Wd45ybO7mvP+4Zdkt nVSDhb3jYL9kMp8j/hu7rmG9DO+n21whz9Xhf1tjbLR66f2i7r2HsVc7Izh/qyKG3yqh Y2+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687272045; x=1689864045; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MAgAO3SChxYdAJy695y2hEJS0ndqqGZpw7Nt6AWvpVg=; b=BSXOSLkl65phq+josVyqv/FuN7L1PJeiK0mT8XCERDx9QaHnZR8Oy8f26uk/O8n/+z iV+2Pqr0EL9FKFhFU45U6EUQolMTwL3SEmgCmJQKlA2lCKsvSa1iD7JcsWuYN83aX+kr XVW9iCASyEd9pVeAXZt5MamlcVd2lOFU8IrIzjj7NB+01c2WimgYqJty2da4tMZP4DXy DGVR562OctFbLlQBk4y/ZJjm3Af3zc2LAVYda9HSt5BBGQJ+Z18VTJRRsFuSBNTbQcUK abhogStPjhFZToztuOZUATJMDME0Bp6Z4uAAnOMbfTKRjkKfgRURp4xO2DpuRrvYCtyG zO7Q== X-Gm-Message-State: AC+VfDxeS4C0xyBpqueY+5W2YOVHipWsp193RmdX5WSThGx20IpeoKkT 8AhyQFt3aJxBdN2wy/3XKFOlMpwwX5I= X-Google-Smtp-Source: ACHHUZ6VoENYz8Oii9YFHPHGa8AI1BVIdyC5RLjfehTnmwA+Tvi/DPzwd/O1aFYCAfNNW51tU+/96w== X-Received: by 2002:a05:6870:ad09:b0:1a6:7eb8:2334 with SMTP id nt9-20020a056870ad0900b001a67eb82334mr8693695oab.47.1687272044564; Tue, 20 Jun 2023 07:40:44 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id nl13-20020a056871458d00b001a69e7efd13sm1417838oab.5.2023.06.20.07.40.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 07:40:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 11:40:35 -0300 Message-ID: <20230620144042.9629-2-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230620144042.9629-1-jamrial@gmail.com> References: <20230620144042.9629-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/9] avformat/evcdec: remove unnecessary av_packet_unref() calls 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 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: And return proper error codes. Signed-off-by: James Almer --- libavformat/evcdec.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c index 9c4969e78f..68f3a91e53 100644 --- a/libavformat/evcdec.c +++ b/libavformat/evcdec.c @@ -186,11 +186,8 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) EVCDemuxContext *const c = s->priv_data; - int eof = avio_feof (s->pb); - if(eof) { - av_packet_unref(pkt); + if (avio_feof(s->pb)) return AVERROR_EOF; - } while(!au_end_found) { uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE]; @@ -200,16 +197,12 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; ret = avio_read(s->pb, (unsigned char *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); - if (ret < 0) { - av_packet_unref(pkt); + if (ret < 0) return ret; - } nalu_size = read_nal_unit_length((const uint8_t *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); - if(nalu_size <= 0) { - av_packet_unref(pkt); - return -1; - } + if (nalu_size <= 0) + return AVERROR_INVALIDDATA; avio_seek(s->pb, -EVC_NALU_LENGTH_PREFIX_SIZE, SEEK_CUR); @@ -217,7 +210,7 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; if (ret != (nalu_size + EVC_NALU_LENGTH_PREFIX_SIZE)) - return AVERROR(EIO); + return AVERROR_INVALIDDATA; ret = av_bsf_send_packet(c->bsf, pkt); if (ret < 0) { -- 2.41.0 _______________________________________________ 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".