diff mbox series

[FFmpeg-devel,2/7] lavc/dvbsub: return meaningful error codes

Message ID 20200410190223.134413-3-jstebbins@jetheaddev.com
State Accepted
Commit 75a845886386bdb1399516f17094aa5d194b9b82
Headers show
Series [FFmpeg-devel,1/7] lavc/dvbsub: fix potential encode buffer overflow | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

John Stebbins April 10, 2020, 7:02 p.m. UTC 
---
 libavcodec/dvbsub.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c
index a0be0b1056..5c081f2b71 100644
--- a/libavcodec/dvbsub.c
+++ b/libavcodec/dvbsub.c
@@ -282,7 +282,7 @@  static int encode_dvb_subtitles(AVCodecContext *avctx,
     page_id = 1;
 
     if (h->num_rects && !h->rects)
-        return -1;
+        return AVERROR(EINVAL);
 
     if (avctx->width > 0 && avctx->height > 0) {
         if (buf_size < 11)
@@ -341,7 +341,7 @@  static int encode_dvb_subtitles(AVCodecContext *avctx,
                 /* 8 bpp, standard encoding */
                 bpp_index = 2;
             } else {
-                return -1;
+                return AVERROR(EINVAL);
             }
 
 
@@ -393,7 +393,7 @@  static int encode_dvb_subtitles(AVCodecContext *avctx,
             /* 8 bpp, standard encoding */
             bpp_index = 2;
         } else {
-            return -1;
+            return AVERROR(EINVAL);
         }
 
         *q++ = 0x0f; /* sync_byte */
@@ -441,7 +441,7 @@  static int encode_dvb_subtitles(AVCodecContext *avctx,
                 /* 8 bpp, standard encoding */
                 dvb_encode_rle = dvb_encode_rle8;
             } else {
-                return -1;
+                return AVERROR(EINVAL);
             }
 
             /* Object Data segment */