[FFmpeg-cvslog] avcodec/hevc_parser: Check init_get_bits8() for failure

Michael Niedermayer git at videolan.org
Fri Sep 4 03:39:48 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Sep  4 03:09:03 2015 +0200| [bd6610c3b39e24ff3c3745cdfc5c69450bc7b0e5] | committer: Michael Niedermayer

avcodec/hevc_parser: Check init_get_bits8() for failure

Fixes: CID1322322

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd6610c3b39e24ff3c3745cdfc5c69450bc7b0e5
---

 libavcodec/hevc_parser.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c
index 35cace5..fc10797 100644
--- a/libavcodec/hevc_parser.c
+++ b/libavcodec/hevc_parser.c
@@ -225,6 +225,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
 
     for (;;) {
         int src_length, consumed;
+        int ret;
         buf = avpriv_find_start_code(buf, buf_end, &state);
         if (--buf + 2 >= buf_end)
             break;
@@ -242,7 +243,10 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
         if (consumed < 0)
             return consumed;
 
-        init_get_bits8(gb, nal->data + 2, nal->size);
+        ret = init_get_bits8(gb, nal->data + 2, nal->size);
+        if (ret < 0)
+            return ret;
+
         switch (h->nal_unit_type) {
         case NAL_VPS:
             ff_hevc_decode_nal_vps(gb, avctx, ps);



More information about the ffmpeg-cvslog mailing list