summaryrefslogtreecommitdiff
path: root/libavcodec/bytestream.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-07-10 09:31:24 +0200
committerAnton Khirnov <anton@khirnov.net>2015-07-12 18:15:39 +0200
commit86eee85daddb682fa072c2e2657c90a514b855e3 (patch)
treef1e23c9cb98ad10418f4f1ea3998266a67da2a7e /libavcodec/bytestream.h
parent8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717 (diff)
downloadffmpeg-86eee85daddb682fa072c2e2657c90a514b855e3.tar.gz
bytestream2: set the reader to the end when reading more than available
This prevents possible infinite loops with the calling code along the lines of while (bytestream2_get_bytes_left()) { ... }, where the reader does not advance. CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/bytestream.h')
-rw-r--r--libavcodec/bytestream.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index 3eab225f9c..cb3573b869 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -70,8 +70,10 @@ static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g) \
} \
static av_always_inline type bytestream2_get_ ## name(GetByteContext *g) \
{ \
- if (g->buffer_end - g->buffer < bytes) \
+ if (g->buffer_end - g->buffer < bytes) { \
+ g->buffer = g->buffer_end; \
return 0; \
+ } \
return bytestream2_get_ ## name ## u(g); \
} \
static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \