[FFmpeg-cvslog] interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

2016-11-26 Thread Andreas Cadhalpun 
ffmpeg | branch: release/3.0 | Andreas Cadhalpun 
 | Sun Oct 30 21:18:20 2016 +0100| 
[aca7f5f0607789b26b1b5d0c2dbe3ae39a229806] | committer: Andreas Cadhalpun

interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

This fixes out-of-bounds reads by the bitstream reader.

Reviewed-by: Paul B Mahol 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit 60178e78f2fe9a7bfb9da0abc985835e2ebfd2f1)
Signed-off-by: Andreas Cadhalpun 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aca7f5f0607789b26b1b5d0c2dbe3ae39a229806
---

 libavcodec/interplayacm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c
index 14cad09..8b34009 100644
--- a/libavcodec/interplayacm.c
+++ b/libavcodec/interplayacm.c
@@ -76,7 +76,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 s->block   = av_calloc(s->block_len, sizeof(int));
 s->wrapbuf = av_calloc(s->wrapbuf_len, sizeof(int));
 s->ampbuf  = av_calloc(0x1, sizeof(int));
-s->bitstream = av_calloc(s->max_framesize, sizeof(*s->bitstream));
+s->bitstream = av_calloc(s->max_framesize + AV_INPUT_BUFFER_PADDING_SIZE / 
sizeof(*s->bitstream) + 1, sizeof(*s->bitstream));
 if (!s->block || !s->wrapbuf || !s->ampbuf || !s->bitstream)
 return AVERROR(ENOMEM);
 

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

[FFmpeg-cvslog] interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

2016-11-26 Thread Andreas Cadhalpun 
ffmpeg | branch: release/3.1 | Andreas Cadhalpun 
 | Sun Oct 30 21:18:20 2016 +0100| 
[5a1433b19ab396cfdc7d52d9b479a7828ce5c707] | committer: Andreas Cadhalpun

interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

This fixes out-of-bounds reads by the bitstream reader.

Reviewed-by: Paul B Mahol 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit 60178e78f2fe9a7bfb9da0abc985835e2ebfd2f1)
Signed-off-by: Andreas Cadhalpun 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a1433b19ab396cfdc7d52d9b479a7828ce5c707
---

 libavcodec/interplayacm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c
index 14cad09..8b34009 100644
--- a/libavcodec/interplayacm.c
+++ b/libavcodec/interplayacm.c
@@ -76,7 +76,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 s->block   = av_calloc(s->block_len, sizeof(int));
 s->wrapbuf = av_calloc(s->wrapbuf_len, sizeof(int));
 s->ampbuf  = av_calloc(0x1, sizeof(int));
-s->bitstream = av_calloc(s->max_framesize, sizeof(*s->bitstream));
+s->bitstream = av_calloc(s->max_framesize + AV_INPUT_BUFFER_PADDING_SIZE / 
sizeof(*s->bitstream) + 1, sizeof(*s->bitstream));
 if (!s->block || !s->wrapbuf || !s->ampbuf || !s->bitstream)
 return AVERROR(ENOMEM);
 

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

[FFmpeg-cvslog] interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

2016-11-17 Thread Andreas Cadhalpun 
ffmpeg | branch: release/3.2 | Andreas Cadhalpun 
 | Sun Oct 30 21:18:20 2016 +0100| 
[6e5ccabbe8461f5bde1c8ad87a2ced343fd2e5b7] | committer: Andreas Cadhalpun

interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

This fixes out-of-bounds reads by the bitstream reader.

Reviewed-by: Paul B Mahol 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit 60178e78f2fe9a7bfb9da0abc985835e2ebfd2f1)
Signed-off-by: Andreas Cadhalpun 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e5ccabbe8461f5bde1c8ad87a2ced343fd2e5b7
---

 libavcodec/interplayacm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c
index 0320531..c897e72 100644
--- a/libavcodec/interplayacm.c
+++ b/libavcodec/interplayacm.c
@@ -77,7 +77,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 s->block   = av_calloc(s->block_len, sizeof(int));
 s->wrapbuf = av_calloc(s->wrapbuf_len, sizeof(int));
 s->ampbuf  = av_calloc(0x1, sizeof(int));
-s->bitstream = av_calloc(s->max_framesize, sizeof(*s->bitstream));
+s->bitstream = av_calloc(s->max_framesize + AV_INPUT_BUFFER_PADDING_SIZE / 
sizeof(*s->bitstream) + 1, sizeof(*s->bitstream));
 if (!s->block || !s->wrapbuf || !s->ampbuf || !s->bitstream)
 return AVERROR(ENOMEM);
 

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

[FFmpeg-cvslog] interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

2016-10-31 Thread Andreas Cadhalpun 
ffmpeg | branch: master | Andreas Cadhalpun  
| Sun Oct 30 21:18:20 2016 +0100| [60178e78f2fe9a7bfb9da0abc985835e2ebfd2f1] | 
committer: Andreas Cadhalpun

interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

This fixes out-of-bounds reads by the bitstream reader.

Reviewed-by: Paul B Mahol 
Signed-off-by: Andreas Cadhalpun 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60178e78f2fe9a7bfb9da0abc985835e2ebfd2f1
---

 libavcodec/interplayacm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c
index 0320531..c897e72 100644
--- a/libavcodec/interplayacm.c
+++ b/libavcodec/interplayacm.c
@@ -77,7 +77,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 s->block   = av_calloc(s->block_len, sizeof(int));
 s->wrapbuf = av_calloc(s->wrapbuf_len, sizeof(int));
 s->ampbuf  = av_calloc(0x1, sizeof(int));
-s->bitstream = av_calloc(s->max_framesize, sizeof(*s->bitstream));
+s->bitstream = av_calloc(s->max_framesize + AV_INPUT_BUFFER_PADDING_SIZE / 
sizeof(*s->bitstream) + 1, sizeof(*s->bitstream));
 if (!s->block || !s->wrapbuf || !s->ampbuf || !s->bitstream)
 return AVERROR(ENOMEM);
 

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