From patchwork Wed Feb 3 10:27:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25366 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 1D36144B1BB for ; Wed, 3 Feb 2021 12:29:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED80D689EEC; Wed, 3 Feb 2021 12:29:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CA4F6807A6 for ; Wed, 3 Feb 2021 12:29:21 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id g10so7892363eds.2 for ; Wed, 03 Feb 2021 02:29:21 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=I1MCQckC03acXDMpT37xmFnUsLA9GH1yhs3goXrSWvw=; b=Qq4EExFDVK85pyhO9WJrw0TsCUD1ucyrOThXR2pYppuhtujDCa5kea9B/jdotGJdod qRTchezqca3BVj7uBE2NfROLcM2uG/CfOTclXH1F+JfFx9euNSUVKUu540QbYCGAJy/L /MAe2xeLiOjcZ9rR93sRNsp2Ajn1Hfa2pIHEIWgeV75C0Kskr6ynL1BQu+Rr5vyK0J/h L4MyFFeRvvJH3+jaLglVwRutCRRpASMDoKu7tNb9+Tc1l4HBlr+YDzuVQUCFQq7xCSHl zywaquy5ZAjtW8zLMi3yUNPNmj9wgZSpV+Kd/K81pYTKNy4Rmv5cEBhqo4Fh7QBwQ2wk Cnyg== 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:mime-version:content-transfer-encoding; bh=I1MCQckC03acXDMpT37xmFnUsLA9GH1yhs3goXrSWvw=; b=Q+HlPWZn9XkqREtAMVH0kIAYUMO1F9+FTzbs1N1g69bjpMnovPrOQuny3e6pImszKv TXLkJSUp0VDms3BiT3F8lRvr6zutbptZ8v8UL5/xPsiu/4AAZgukwJji28Fz1/j1YaqT YKOiDIX7Qzko+qvl95tQznvYjtsam/3DeIQDPHnBqxAd2th1aLnR0k2G6mcuuuYyzUwg lZNoNaI4/DbPmh3F9Mdem1ppWfkAyL9znItPf7skFqh/+FepwM1SM5eVJTBsnKYRTv2+ nG5nv0vLpJCMfggxLxhce2YSOBh36cGuC+DB0kJS6ZbJqUugXEyCO0ion3jXyxDxRcSh 8FhA== X-Gm-Message-State: AOAM530op47faLixU3cojulp5mNriY2In/XfJYcpzXQF5C9qVnhULmFK yohoKpQDMJ3Gmdc5dWIqdyLv6wazjaI= X-Google-Smtp-Source: ABdhPJxDGsPIXxy+KL0Du8UKPQGhOpfkBGjf4g8kxvgIHN0w8iN6W962ko4tT0sH//Zyv6JUDYkC/Q== X-Received: by 2002:aa7:d399:: with SMTP id x25mr2192441edq.237.1612348160384; Wed, 03 Feb 2021 02:29:20 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id y11sm804041ejd.72.2021.02.03.02.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 02:29:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 11:27:47 +0100 Message-Id: <20210203102749.473999-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210203102749.473999-1-andreas.rheinhardt@gmail.com> References: <20210203102749.473999-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat: Use ffio_read_size where appropriate 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/aaxdec.c | 9 +++------ libavformat/act.c | 9 +++------ libavformat/kvag.c | 5 ++--- libavformat/nuv.c | 7 ++++--- libavformat/pva.c | 7 ++++--- libavformat/riffdec.c | 6 +++--- libavformat/utils.c | 6 +++--- libavformat/wavdec.c | 8 ++++---- 8 files changed, 26 insertions(+), 31 deletions(-) diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c index 7d10e805ca..45648532d6 100644 --- a/libavformat/aaxdec.c +++ b/libavformat/aaxdec.c @@ -22,6 +22,7 @@ #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "avio_internal.h" #include "internal.h" typedef struct AAXColumn { @@ -219,13 +220,9 @@ static int aax_read_header(AVFormatContext *s) } avio_seek(pb, a->strings_offset, SEEK_SET); - ret = avio_read(pb, a->string_table, a->strings_size); - if (ret != a->strings_size) { - if (ret < 0) - goto fail; - ret = AVERROR(EIO); + ret = ffio_read_size(pb, a->string_table, a->strings_size); + if (ret < 0) goto fail; - } for (int c = 0; c < a->columns; c++) { int64_t data_offset = 0; diff --git a/libavformat/act.c b/libavformat/act.c index 26425ca1bb..9e72bba21c 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" +#include "avio_internal.h" #include "riff.h" #include "internal.h" #include "libavcodec/get_bits.h" @@ -126,12 +127,10 @@ static int read_packet(AVFormatContext *s, if(s->streams[0]->codecpar->sample_rate==4400 && !ctx->second_packet) { - ret = avio_read(pb, ctx->audio_buffer, frame_size); + ret = ffio_read_size(pb, ctx->audio_buffer, frame_size); if(ret<0) return ret; - if(ret!=frame_size) - return AVERROR(EIO); pkt->data[0]=ctx->audio_buffer[11]; pkt->data[1]=ctx->audio_buffer[0]; @@ -165,12 +164,10 @@ static int read_packet(AVFormatContext *s, } else // 8000 Hz { - ret = avio_read(pb, ctx->audio_buffer, frame_size); + ret = ffio_read_size(pb, ctx->audio_buffer, frame_size); if(ret<0) return ret; - if(ret!=frame_size) - return AVERROR(EIO); pkt->data[0]=ctx->audio_buffer[5]; pkt->data[1]=ctx->audio_buffer[0]; diff --git a/libavformat/kvag.c b/libavformat/kvag.c index 8f641873b9..524cb3870c 100644 --- a/libavformat/kvag.c +++ b/libavformat/kvag.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" +#include "avio_internal.h" #include "internal.h" #include "rawenc.h" #include "libavutil/intreadwrite.h" @@ -55,10 +56,8 @@ static int kvag_read_header(AVFormatContext *s) if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); - if ((ret = avio_read(s->pb, buf, KVAG_HEADER_SIZE)) < 0) + if ((ret = ffio_read_size(s->pb, buf, KVAG_HEADER_SIZE)) < 0) return ret; - else if (ret != KVAG_HEADER_SIZE) - return AVERROR(EIO); hdr.magic = AV_RL32(buf + 0); hdr.data_size = AV_RL32(buf + 4); diff --git a/libavformat/nuv.c b/libavformat/nuv.c index df90df4938..6bfdd3e82f 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -24,6 +24,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/intfloat.h" #include "avformat.h" +#include "avio_internal.h" #include "internal.h" #include "riff.h" @@ -258,9 +259,9 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) int copyhdrsize = ctx->rtjpg_video ? HDRSIZE : 0; uint64_t pos = avio_tell(pb); - ret = avio_read(pb, hdr, HDRSIZE); - if (ret < HDRSIZE) - return ret < 0 ? ret : AVERROR(EIO); + ret = ffio_read_size(pb, hdr, HDRSIZE); + if (ret < 0) + return ret; frametype = hdr[0]; size = PKTSIZE(AV_RL32(&hdr[8])); diff --git a/libavformat/pva.c b/libavformat/pva.c index 58ec78750c..89b8608766 100644 --- a/libavformat/pva.c +++ b/libavformat/pva.c @@ -20,6 +20,7 @@ */ #include "avformat.h" +#include "avio_internal.h" #include "internal.h" #include "mpeg.h" @@ -147,9 +148,9 @@ recover: goto recover; } - ret = avio_read(pb, pes_header_data, pes_header_data_length); - if (ret != pes_header_data_length) - return ret < 0 ? ret : AVERROR_INVALIDDATA; + ret = ffio_read_size(pb, pes_header_data, pes_header_data_length); + if (ret < 0) + return ret; length -= 9 + pes_header_data_length; pes_packet_length -= 3 + pes_header_data_length; diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 533bb5a15d..c04dec6f57 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -33,10 +33,10 @@ int ff_get_guid(AVIOContext *s, ff_asf_guid *g) { int ret; av_assert0(sizeof(*g) == 16); //compiler will optimize this out - ret = avio_read(s, *g, sizeof(*g)); - if (ret < (int)sizeof(*g)) { + ret = ffio_read_size(s, *g, sizeof(*g)); + if (ret < 0) { memset(*g, 0, sizeof(*g)); - return ret < 0 ? ret : AVERROR_INVALIDDATA; + return ret; } return 0; } diff --git a/libavformat/utils.c b/libavformat/utils.c index fb3299503e..2bffadb6b9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3306,12 +3306,12 @@ int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext *pb int ret = ff_alloc_extradata(par, size); if (ret < 0) return ret; - ret = avio_read(pb, par->extradata, size); - if (ret != size) { + ret = ffio_read_size(pb, par->extradata, size); + if (ret < 0) { av_freep(&par->extradata); par->extradata_size = 0; av_log(s, AV_LOG_ERROR, "Failed to read extradata of size %d\n", size); - return ret < 0 ? ret : AVERROR_INVALIDDATA; + return ret; } return ret; diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 256c36ebe2..7de4c9df97 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -236,8 +236,8 @@ static inline int wav_parse_bext_string(AVFormatContext *s, const char *key, int ret; av_assert0(length < sizeof(temp)); - if ((ret = avio_read(s->pb, temp, length)) != length) - return ret < 0 ? ret : AVERROR_INVALIDDATA; + if ((ret = ffio_read_size(s->pb, temp, length)) < 0) + return ret; temp[length] = 0; @@ -306,9 +306,9 @@ static int wav_parse_bext_tag(AVFormatContext *s, int64_t size) if (!(coding_history = av_malloc(size + 1))) return AVERROR(ENOMEM); - if ((ret = avio_read(s->pb, coding_history, size)) != size) { + if ((ret = ffio_read_size(s->pb, coding_history, size)) < 0) { av_free(coding_history); - return ret < 0 ? ret : AVERROR_INVALIDDATA; + return ret; } coding_history[size] = 0;