[FFmpeg-devel] [PATCH 8/8] avformat/mpegts: return proper error codes

lance.lmwang at gmail.com lance.lmwang at gmail.com
Thu Oct 14 16:09:02 EEST 2021


From: Limin Wang <lance.lmwang at gmail.com>

Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
---
 libavformat/mpegts.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 774964d..3157e3a 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2270,22 +2270,22 @@ static int parse_stream_identifier_desc(const uint8_t *p, const uint8_t *p_end)
 
     desc_list_len = get16(pp, p_end);
     if (desc_list_len < 0)
-        return -1;
+        return AVERROR_INVALIDDATA;
     desc_list_len &= 0xfff;
     desc_list_end  = p + desc_list_len;
     if (desc_list_end > p_end)
-        return -1;
+        return AVERROR_INVALIDDATA;
 
     while (1) {
         desc_tag = get8(pp, desc_list_end);
         if (desc_tag < 0)
-            return -1;
+            return AVERROR_INVALIDDATA;
         desc_len = get8(pp, desc_list_end);
         if (desc_len < 0)
-            return -1;
+            return AVERROR_INVALIDDATA;
         desc_end = *pp + desc_len;
         if (desc_end > desc_list_end)
-            return -1;
+            return AVERROR_INVALIDDATA;
 
         if (desc_tag == 0x52) {
             return get8(pp, desc_end);
@@ -2293,7 +2293,7 @@ static int parse_stream_identifier_desc(const uint8_t *p, const uint8_t *p_end)
         *pp = desc_end;
     }
 
-    return -1;
+    return AVERROR_INVALIDDATA;
 }
 
 static int is_pes_stream(int stream_type, uint32_t prog_reg_desc)
-- 
1.8.3.1



More information about the ffmpeg-devel mailing list