summaryrefslogtreecommitdiff
authorSenbai Tao <senbai.tao@amlogic.com>2015-12-17 02:52:22 (GMT)
committer Senbai Tao <senbai.tao@amlogic.com>2015-12-17 02:52:22 (GMT)
commit6aacd39b56b681bcb53b180caeebf5faa653f72a (patch)
treebcf0b116de3a5bbe9954c8eaa57c7957a068340d
parenta712f1a748a250a4b96b14ccc62d8b8b03fb288a (diff)
downloadffmpeg-6aacd39b56b681bcb53b180caeebf5faa653f72a.zip
ffmpeg-6aacd39b56b681bcb53b180caeebf5faa653f72a.tar.gz
ffmpeg-6aacd39b56b681bcb53b180caeebf5faa653f72a.tar.bz2
PD #116550: prevent crashing in hevc rbsp.
Change-Id: Ia81faba515e7d9f47f16e31ddff31a5c0192dc4a
Diffstat
-rw-r--r--libavcodec/hevc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index aaf319f..412ba19 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2296,6 +2296,7 @@ int ff_hevc_extract_rbsp(HEVCContext *s, const uint8_t *src, int length,
dst[di++] = 0;
si += 3;
+#if 0
s->skipped_bytes++;
if (s->skipped_bytes_pos_size < s->skipped_bytes) {
s->skipped_bytes_pos_size *= 2;
@@ -2307,6 +2308,7 @@ int ff_hevc_extract_rbsp(HEVCContext *s, const uint8_t *src, int length,
}
if (s->skipped_bytes_pos)
s->skipped_bytes_pos[s->skipped_bytes-1] = di - 1;
+#endif
continue;
} else // next start code
goto nsc;