virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

bytestream: Make get_bytes_left compatible with overread

Browse Source 
bytestream2_get_bytes_left returns an unsigned int; as a result,
it returns big positive numbers if an overread already happened,
making it unsuitable for scenarios where one wants to allow this
in a controlled way (because the buffer is actually padded so that
no segfaults can happen). So change it to return an ordinary int.

Also, bytestream2_get_bytes_left_p has been modified in the same way.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt 2019-12-14 23:19:14 +01:00 committed by Michael Niedermayer
parent a2e4879432
commit 7f96325bc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/bytestream.h
View File

@ -151,12 +151,12 @@ static av_always_inline void bytestream2_init_writer(PutByteContext *p,
p->eof = 0; p->eof = 0;
} }
static av_always_inline unsigned int bytestream2_get_bytes_left(GetByteContext *g) static av_always_inline int bytestream2_get_bytes_left(GetByteContext *g)
{ {
return g->buffer_end - g->buffer; return g->buffer_end - g->buffer;
} }
static av_always_inline unsigned int bytestream2_get_bytes_left_p(PutByteContext *p) static av_always_inline int bytestream2_get_bytes_left_p(PutByteContext *p)
{ {
return p->buffer_end - p->buffer; return p->buffer_end - p->buffer;
} }