avcodec/xsubdec: Check av_mallocz() return codes
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Jan 2015 16:15:15 +0000 (17:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Jan 2015 16:15:15 +0000 (17:15 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/xsubdec.c

index 94a68e2bb41147411185a8e5d03fa52f4a9259f6..1bb90e2b9dd7de4f57163eb149b6642257566f92 100644 (file)
@@ -93,8 +93,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
     // allocate sub and set values
     sub->rects =  av_mallocz(sizeof(*sub->rects));
+    if (!sub->rects)
+        return AVERROR(ENOMEM);
+
     sub->rects[0] = av_mallocz(sizeof(*sub->rects[0]));
-    sub->num_rects = 1;
+    if (!sub->rects[0]) {
+        av_freep(&sub->rects);
+        return AVERROR(ENOMEM);
+    }
     sub->rects[0]->x = x; sub->rects[0]->y = y;
     sub->rects[0]->w = w; sub->rects[0]->h = h;
     sub->rects[0]->type = SUBTITLE_BITMAP;
@@ -102,6 +108,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     sub->rects[0]->pict.data[0] = av_malloc(w * h);
     sub->rects[0]->nb_colors = 4;
     sub->rects[0]->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
+    if (!sub->rects[0]->pict.data[0] || !sub->rects[0]->pict.data[1]) {
+        av_freep(&sub->rects[0]);
+        av_freep(&sub->rects);
+        return AVERROR(ENOMEM);
+
+    }
+    sub->num_rects = 1;
 
     // read palette
     for (i = 0; i < sub->rects[0]->nb_colors; i++)