Re: [FFmpeg-devel] [PATCH] avcodec/get_bits: Make sure the input bitstream with padding can be addressed

2018-03-28 Thread Michael Niedermayer 
On Wed, Mar 28, 2018 at 01:11:06AM -0300, James Almer wrote:
> On 3/25/2018 9:13 PM, Michael Niedermayer wrote:
> > On Sat, Mar 24, 2018 at 01:56:26AM +0100, Michael Niedermayer wrote:
> >> Signed-off-by: Michael Niedermayer 
> >> ---
> >>  libavcodec/get_bits.h | 3 ++-
> >>  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > will apply
> 
> HOSTCClibavcodec/qdm2_tablegen.o
> In file included from src/libavcodec/tableprint_vlc.h:40,
>  from src/libavcodec/qdm2_tablegen.c:25:
> src/libavcodec/get_bits.h: In function 'init_get_bits':
> src/libavcodec/get_bits.h:432: error: 'AV_INPUT_BUFFER_PADDING_SIZE'
> undeclared (first use in this function)
> src/libavcodec/get_bits.h:432: error: (Each undeclared identifier is
> reported only once
> src/libavcodec/get_bits.h:432: error: for each function it appears in.)
> /home/fate/src/ffbuild/common.mak:152: recipe for target
> 'libavcodec/qdm2_tablegen.o' failed
> 
> When compiling with --enable-hardcoded-tables

will fix

thx

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No human being will ever know the Truth, for even if they happen to say it
by chance, they would not even known they had done so. -- Xenophanes


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avcodec/get_bits: Make sure the input bitstream with padding can be addressed

2018-03-27 Thread James Almer 
On 3/25/2018 9:13 PM, Michael Niedermayer wrote:
> On Sat, Mar 24, 2018 at 01:56:26AM +0100, Michael Niedermayer wrote:
>> Signed-off-by: Michael Niedermayer 
>> ---
>>  libavcodec/get_bits.h | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> will apply

HOSTCC  libavcodec/qdm2_tablegen.o
In file included from src/libavcodec/tableprint_vlc.h:40,
 from src/libavcodec/qdm2_tablegen.c:25:
src/libavcodec/get_bits.h: In function 'init_get_bits':
src/libavcodec/get_bits.h:432: error: 'AV_INPUT_BUFFER_PADDING_SIZE'
undeclared (first use in this function)
src/libavcodec/get_bits.h:432: error: (Each undeclared identifier is
reported only once
src/libavcodec/get_bits.h:432: error: for each function it appears in.)
/home/fate/src/ffbuild/common.mak:152: recipe for target
'libavcodec/qdm2_tablegen.o' failed

When compiling with --enable-hardcoded-tables
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avcodec/get_bits: Make sure the input bitstream with padding can be addressed

2018-03-25 Thread Michael Niedermayer 
On Sat, Mar 24, 2018 at 01:56:26AM +0100, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/get_bits.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

will apply

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many things microsoft did are stupid, but not doing something just because
microsoft did it is even more stupid. If everything ms did were stupid they
would be bankrupt already.


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avcodec/get_bits: Make sure the input bitstream with padding can be addressed

2018-03-23 Thread Michael Niedermayer 
Signed-off-by: Michael Niedermayer 
---
 libavcodec/get_bits.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index f90a06c7a5..56ef5f0cbe 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -32,6 +32,7 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
 #include "libavutil/avassert.h"
+#include "avcodec.h"
 #include "mathops.h"
 #include "vlc.h"
 
@@ -435,7 +436,7 @@ static inline int init_get_bits(GetBitContext *s, const 
uint8_t *buffer,
 int buffer_size;
 int ret = 0;
 
-if (bit_size >= INT_MAX - 7 || bit_size < 0 || !buffer) {
+if (bit_size >= INT_MAX - FFMAX(7, AV_INPUT_BUFFER_PADDING_SIZE*8) || 
bit_size < 0 || !buffer) {
 bit_size= 0;
 buffer  = NULL;
 ret = AVERROR_INVALIDDATA;
-- 
2.16.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel