diff mbox series

[FFmpeg-devel,4/6] avcodec/xiph: Return better error codes

Message ID 20200517231319.13067-4-andreas.rheinhardt@gmail.com
State Accepted
Commit 6fb79c1af576a10767ba9b2a95b73d28dee179fb
Headers show
Series [FFmpeg-devel,1/6] avformat/segment: Access AVStream more directly
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt May 17, 2020, 11:13 p.m. UTC
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
There is another "return -1" left which might either be invalid data or
an unsupported future extension of the format (e.g. one that does not
have three arrays). I left this as is.

 libavcodec/xiph.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c
index d072224b4a..3073315e63 100644
--- a/libavcodec/xiph.c
+++ b/libavcodec/xiph.c
@@ -35,7 +35,7 @@  int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size,
             header_start[i] = extradata;
             extradata += header_len[i];
             if (overall_len > extradata_size - header_len[i])
-                return -1;
+                return AVERROR_INVALIDDATA;
             overall_len += header_len[i];
         }
     } else if (extradata_size >= 3 && extradata_size < INT_MAX - 0x1ff && extradata[0] == 2) {
@@ -50,7 +50,7 @@  int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size,
             header_len[i] += *extradata;
             overall_len   += *extradata;
             if (overall_len > extradata_size)
-                return -1;
+                return AVERROR_INVALIDDATA;
         }
         header_len[2] = extradata_size - overall_len;
         header_start[0] = extradata;