October 2013 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/dxva2_mpeg2: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [34087b05642a95530818be56fc7d7003e9ce51a0] | committer: Michael Niedermayer avcodec/dxva2_mpeg2: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34087b05642a95530… --- libavcodec/dxva2_mpeg2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index 542f17c..1827dd5 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -139,8 +139,7 @@ static void fill_slice(AVCodecContext *avctx, init_get_bits(&gb, &buffer[4], 8 * (size - 4)); slice->wQuantizerScaleCode = get_bits(&gb, 5); - while (get_bits1(&gb)) - skip_bits(&gb, 8); + skip_1stop_8data_bits(&gb); slice->wMBbitOffset = 4 * 8 + get_bits_count(&gb); }

1 0

avcodec/get_bits: add skip_1stop_8data_bits
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:22:03 2013 +0100| [44e8e82d347fe2c19b84b74f419aeae73f4347ce] | committer: Michael Niedermayer avcodec/get_bits: add skip_1stop_8data_bits Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44e8e82d347fe2c19… --- libavcodec/get_bits.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 4ddb088..7824e5a 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -585,6 +585,20 @@ static inline int get_bits_left(GetBitContext *gb) return gb->size_in_bits - get_bits_count(gb); } +static inline int skip_1stop_8data_bits(GetBitContext *gb) +{ + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; + + while (get_bits1(gb)) { + skip_bits(gb, 8); + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; + } + + return 0; +} + //#define TRACE #ifdef TRACE

1 0

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 17:48:43 2013 +0100| [7f019129e1bdeeb7fd0af05dc002b133df530f03] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: lavf: Remove a now useless parameter to ffurl_register_protocol Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f019129e1bdeeb7f… ---

1 0

lavf: Remove a now useless parameter to ffurl_register_protocol
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Tue Oct 29 22:52:09 2013 +0200| [0c5f839693da2276c2da23400f67a67be4ea0af1] | committer: Martin Storsjö lavf: Remove a now useless parameter to ffurl_register_protocol This was added in 9b07a2dc02e9 as an ABI hack to allow older code built with lavf 52 to register protocols even if the size of the URLProtocol struct was increased. Later, registering protocols from outside of lavf was removed and this workaround isn't needed any longer since lavf 53. This removes an unchecked malloc and a memory leak for the cases when this workaround actually was used - which it hasn't since lavf 53. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c5f839693da2276c… --- libavformat/allformats.c | 3 +-- libavformat/avio.c | 7 +------ libavformat/url.h | 4 +--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d72a127..fe5f582 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -45,8 +45,7 @@ { \ extern URLProtocol ff_##x##_protocol; \ if (CONFIG_##X##_PROTOCOL) \ - ffurl_register_protocol(&ff_##x##_protocol, \ - sizeof(ff_##x##_protocol)); \ + ffurl_register_protocol(&ff_##x##_protocol); \ } void av_register_all(void) diff --git a/libavformat/avio.c b/libavformat/avio.c index e07b236..fe42974 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -94,14 +94,9 @@ const char *avio_enum_protocols(void **opaque, int output) return avio_enum_protocols(opaque, output); } -int ffurl_register_protocol(URLProtocol *protocol, int size) +int ffurl_register_protocol(URLProtocol *protocol) { URLProtocol **p; - if (size < sizeof(URLProtocol)) { - URLProtocol *temp = av_mallocz(sizeof(URLProtocol)); - memcpy(temp, protocol, size); - protocol = temp; - } p = &first_protocol; while (*p != NULL) p = &(*p)->next; diff --git a/libavformat/url.h b/libavformat/url.h index c27d079..ff1e21b 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -224,10 +224,8 @@ int ffurl_shutdown(URLContext *h, int flags); /** * Register the URLProtocol protocol. - * - * @param size the size of the URLProtocol struct referenced */ -int ffurl_register_protocol(URLProtocol *protocol, int size); +int ffurl_register_protocol(URLProtocol *protocol); /** * Check if the user has requested to interrup a blocking function

1 0

avcodec/intelh263dec: make while get_bits loop more robust by checking bits left
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 14:23:30 2013 +0100| [94a80e36d307a5fbd8f2df1fa0cf8699bfad0ac9] | committer: Michael Niedermayer avcodec/intelh263dec: make while get_bits loop more robust by checking bits left Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94a80e36d307a5fbd… --- libavcodec/intelh263dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index e5462e7..a45560c 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -113,6 +113,8 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) /* PEI */ while (get_bits1(&s->gb) != 0) { skip_bits(&s->gb, 8); + if (get_bits_left(&s->gb) <= 0) + return AVERROR_INVALIDDATA; } s->f_code = 1;

1 0

avcodec/ituh263dec: make while get_bits loop more robust by checking bits left
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 14:23:30 2013 +0100| [810f9c5eaac277613cd855ae9b4b6e7977cda742] | committer: Michael Niedermayer avcodec/ituh263dec: make while get_bits loop more robust by checking bits left Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=810f9c5eaac277613… --- libavcodec/ituh263dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 2cad21d..5fbf89f 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1115,6 +1115,8 @@ int ff_h263_decode_picture_header(MpegEncContext *s) /* PEI */ while (get_bits1(&s->gb) != 0) { skip_bits(&s->gb, 8); + if (get_bits_left(&s->gb) <= 0) + return AVERROR_INVALIDDATA; } if(s->h263_slice_structured){

1 0

avcodec/ivi_common: make while get_bits loop more robust by checking bits left
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 14:23:30 2013 +0100| [489c575bd6f8d5e6ac2e9106b7efa7e25a68f478] | committer: Michael Niedermayer avcodec/ivi_common: make while get_bits loop more robust by checking bits left Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=489c575bd6f8d5e6a… --- libavcodec/ivi_common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 4179852..ab4c995 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -1042,7 +1042,12 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, */ if (avctx->codec_id == AV_CODEC_ID_INDEO4 && ctx->frame_type == 0/*FRAMETYPE_INTRA*/) { - while (get_bits(&ctx->gb, 8)); // skip version string + // skip version string + while (get_bits(&ctx->gb, 8)) { + if (get_bits_left(&ctx->gb) < 8) + return AVERROR_INVALIDDATA; + } + skip_bits_long(&ctx->gb, 64); // skip padding, TODO: implement correct 8-bytes alignment if (get_bits_left(&ctx->gb) > 18 && show_bits(&ctx->gb, 18) == 0x3FFF8) av_log(avctx, AV_LOG_ERROR, "Buffer contains IP frames!\n");

1 0

avcodec/flacdec: use get_unary() simplify code
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 14:58:04 2013 +0100| [4b12930f79eda58f522f8449e67769f1b2b012d7] | committer: Michael Niedermayer avcodec/flacdec: use get_unary() simplify code Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b12930f79eda58f5… --- libavcodec/flacdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 95623cb..596b24d 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -45,6 +45,8 @@ #include "flacdata.h" #include "flacdsp.h" #include "thread.h" +#include "unary.h" + typedef struct FLACContext { FLACSTREAMINFO @@ -357,7 +359,6 @@ static inline int decode_subframe(FLACContext *s, int channel) if (get_bits1(&s->gb)) { int left = get_bits_left(&s->gb); - wasted = 1; if ( left < 0 || (left < bps && !show_bits_long(&s->gb, left)) || !show_bits_long(&s->gb, bps)) { @@ -366,11 +367,7 @@ static inline int decode_subframe(FLACContext *s, int channel) bps, left); return AVERROR_INVALIDDATA; } - while (!get_bits1(&s->gb)) { - wasted++; - if (get_bits_left(&s->gb) <= 0) - return AVERROR_INVALIDDATA; - } + wasted = 1 + get_unary(&s->gb, 1, get_bits_left(&s->gb)); bps -= wasted; } if (bps > 32) {

1 0

avcodec/h261dec: make while get_bits loop more robust by checking bits left
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 14:23:30 2013 +0100| [719dbe86ea0e85b3b89f492c69e10bb0e733bcbb] | committer: Michael Niedermayer avcodec/h261dec: make while get_bits loop more robust by checking bits left Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=719dbe86ea0e85b3b… --- libavcodec/h261dec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 5e45fc7..2995d8c 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -125,8 +125,11 @@ static int h261_decode_gob_header(H261Context *h) } /* GEI */ - while (get_bits1(&s->gb) != 0) + while (get_bits1(&s->gb) != 0) { skip_bits(&s->gb, 8); + if (get_bits_left(&s->gb) <= 0) + return AVERROR_INVALIDDATA; + } if (s->qscale == 0) { av_log(s->avctx, AV_LOG_ERROR, "qscale has forbidden 0 value\n"); @@ -505,8 +508,11 @@ static int h261_decode_picture_header(H261Context *h) skip_bits1(&s->gb); /* Reserved */ /* PEI */ - while (get_bits1(&s->gb) != 0) + while (get_bits1(&s->gb) != 0) { skip_bits(&s->gb, 8); + if (get_bits_left(&s->gb) <= 0) + return AVERROR_INVALIDDATA; + } /* H.261 has no I-frames, but if we pass AV_PICTURE_TYPE_I for the first * frame, the codec crashes if it does not contain all I-blocks

1 0

avcodec/flvdec: make while get_bits loop more robust by checking bits left
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 14:23:30 2013 +0100| [b0f8b5c8190ae1f8abf56695c8211d6e82022323] | committer: Michael Niedermayer avcodec/flvdec: make while get_bits loop more robust by checking bits left Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0f8b5c8190ae1f8a… --- libavcodec/flvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 3e55aaf..af60dad 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -104,6 +104,8 @@ int ff_flv_decode_picture_header(MpegEncContext *s) /* PEI */ while (get_bits1(&s->gb) != 0) { skip_bits(&s->gb, 8); + if (get_bits_left(&s->gb) <= 0) + return AVERROR_INVALIDDATA; } s->f_code = 1;

1 0