summaryrefslogtreecommitdiff
path: root/libavcodec/dvbsubdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-14 23:25:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-14 23:25:39 +0200
commit9f0b898e8258a9a51b290f4c145388d62080f868 (patch)
tree4b2373f0198ec8ad889e71e4c8349486ae7981fb /libavcodec/dvbsubdec.c
parent8f1afde11d4d76fc2444074b45d76a5113d1d748 (diff)
avcodec/dvbsubdec: Clear w/h/size on region buffer allocation failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvbsubdec.c')
-rw-r--r--libavcodec/dvbsubdec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 8c2a0ea5ab..7c3dedf773 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -1198,8 +1198,12 @@ static int dvbsub_parse_region_segment(AVCodecContext *avctx,
region->buf_size = region->width * region->height;
region->pbuf = av_malloc(region->buf_size);
- if (!region->pbuf)
+ if (!region->pbuf) {
+ region->buf_size =
+ region->width =
+ region->height = 0;
return AVERROR(ENOMEM);
+ }
fill = 1;
region->dirty = 0;