Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'

[ffmpeg] / libavcodec / h2645_parse.c

diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
index 00594371c0c83633c347deaf55ba09292232e4f0..c3961a5e90cbc4e850542378ee2e35531d2c3dd0 100644 (file)
--- a/libavcodec/h2645_parse.c
+++ b/libavcodec/h2645_parse.c
@@ -88,7 +88,8 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length,
         nal->size     =
         nal->raw_size = length;
         return length;
-    }
+    } else if (i > length)
+        i = length;
 
     av_fast_padded_malloc(&nal->rbsp_buffer, &nal->rbsp_buffer_size,
                           length + padding);