virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/flacdec: Return correct error-codes on read-failure

Browse Source 
Forward errors from `avio_read` directly. When `avio_read` sees EOF before
expected bytes can be read, consistently return `AVERROR_INVALIDDATA`

We used to return `AVERROR(AVERROR_INVALIDDATA)` when failing to read
metadata block headers. `AVERROR_INVALIDDATA` is already negative, so
wrapping in `AVERROR` leads to double-negation.

We used to return `AVERROR(EIO)` when failing to read extended metadata.
However, many times, the IO-layer is not at fault, the input data is simply
corrupted (truncated), so we return `AVERROR_INVALIDDATA` here as well.

---

Tomas: changed to use AVERROR_EOF
This commit is contained in:
Ulrik
2023-01-26 17:51:02 +01:00
committed by Tomas Härdin
parent 399234ee2a
commit 95314cd7c5
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/flacdec.c
View File

@@ -80,8 +80,13 @@ static int flac_read_header(AVFormatContext *s)
/* process metadata blocks */ /* process metadata blocks */
while (!avio_feof(s->pb) && !metadata_last) { while (!avio_feof(s->pb) && !metadata_last) {
if (avio_read(s->pb, header, 4) != 4) ret = avio_read(s->pb, header, 4);
return AVERROR_INVALIDDATA; if (ret < 0) {
return ret;
} else if (ret != 4) {
return AVERROR_EOF;
}
flac_parse_block_header(header, &metadata_last, &metadata_type, flac_parse_block_header(header, &metadata_last, &metadata_type,
&metadata_size); &metadata_size);
switch (metadata_type) { switch (metadata_type) {
@@ -95,8 +100,11 @@ static int flac_read_header(AVFormatContext *s)
if (!buffer) { if (!buffer) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (avio_read(s->pb, buffer, metadata_size) != metadata_size) { ret = avio_read(s->pb, buffer, metadata_size);
RETURN_ERROR(AVERROR(EIO)); if (ret < 0) {
RETURN_ERROR(ret);
} else if (ret != metadata_size) {
RETURN_ERROR(AVERROR_EOF);
} }
break; break;
/* skip metadata block for unsupported types */ /* skip metadata block for unsupported types */