From 96b99eae832a268f8445d438aec3e7bd2dabc88b Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Fri, 6 Nov 2015 13:24:27 -0800 Subject: decavcodec: don't try to memset NULL buffers --- libhb/decavcodec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'libhb') diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index 215a58902..ab8011922 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -532,7 +532,10 @@ static int decavcodecaWork( hb_work_object_t * w, hb_buffer_t ** buf_in, // libavcodec/mpeg12dec.c requires buffers to be zero padded. // If not zero padded, it can get stuck in an infinite loop. // It's likely there are other decoders that expect the same. - memset(in->data + in->size, 0, in->alloc - in->size); + if (in->data != NULL) + { + memset(in->data + in->size, 0, in->alloc - in->size); + } if (in->s.flags & HB_BUF_FLAG_EOF) { @@ -1790,7 +1793,10 @@ static int decavcodecvWork( hb_work_object_t * w, hb_buffer_t ** buf_in, // libavcodec/mpeg12dec.c requires buffers to be zero padded. // If not zero padded, it can get stuck in an infinite loop. // It's likely there are other decoders that expect the same. - memset(in->data + in->size, 0, in->alloc - in->size); + if (in->data != NULL) + { + memset(in->data + in->size, 0, in->alloc - in->size); + } /* if we got an empty buffer signaling end-of-stream send it downstream */ if (in->s.flags & HB_BUF_FLAG_EOF) -- cgit v1.2.3