[FFmpeg-devel] [PATCH 10/11] libzvbi-teletextdec: dont ignore memory allocation error silently

Marton Balint cus at passwd.hu
Thu Oct 31 21:28:56 CET 2013


Signed-off-by: Marton Balint <cus at passwd.hu>
---
 libavcodec/libzvbi-teletextdec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c
index 4678d5f..2829363 100644
--- a/libavcodec/libzvbi-teletextdec.c
+++ b/libavcodec/libzvbi-teletextdec.c
@@ -438,6 +438,8 @@ teletext_decode_frame(AVCodecContext *avctx,
             if (sub->rects) {
                 sub->num_rects = 1;
                 sub->rects[0] = ctx->pages->sub_rect;
+            } else {
+                ret = AVERROR(ENOMEM);
             }
         } else {
             av_log(avctx, AV_LOG_DEBUG, "sending empty sub\n");
@@ -450,7 +452,8 @@ teletext_decode_frame(AVCodecContext *avctx,
             ctx->pages[i] = ctx->pages[i + 1];
         ctx->nb_pages--;
 
-        *data_size = 1;
+        if (ret >= 0)
+            *data_size = 1;
     } else
         *data_size = 0;
 
-- 
1.8.1.4



More information about the ffmpeg-devel mailing list