RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '7b588bb691644e1b3c168b99accf74248a24e3cf' 

* commit '7b588bb691644e1b3c168b99accf74248a24e3cf':
  svq1: do not modify the input packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-07 02:06:45 +02:00
parent c628627995 7b588bb691
commit e55e09949e
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/svq1dec.c
View File

@ -60,6 +60,10 @@ typedef struct SVQ1Context {
HpelDSPContext hdsp; HpelDSPContext hdsp;
GetBitContext gb; GetBitContext gb;
AVFrame *prev; AVFrame *prev;
uint8_t *pkt_swapped;
int pkt_swapped_allocated;
int width; int width;
int height; int height;
int frame_code; int frame_code;
@ -624,7 +628,24 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data,
/* swap some header bytes (why?) */ /* swap some header bytes (why?) */
if (s->frame_code != 0x20) { if (s->frame_code != 0x20) {
uint32_t *src = (uint32_t *)(buf + 4); uint32_t *src;
if (buf_size < 9 * 4) {
av_log(avctx, AV_LOG_ERROR, "Input packet too small\n");
return AVERROR_INVALIDDATA;
}
av_fast_malloc(s->pkt_swapped, &s->pkt_swapped_allocated,
buf_size);
if (!s->pkt_swapped)
return AVERROR(ENOMEM);
memcpy(s->pkt_swapped, buf, buf_size);
buf = s->pkt_swapped;
init_get_bits(&s->gb, buf, buf_size * 8);
skip_bits(&s->gb, 22);
src = (uint32_t *)(s->pkt_swapped + 4);
if (buf_size < 36) if (buf_size < 36)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -796,6 +817,7 @@ static av_cold int svq1_decode_end(AVCodecContext *avctx)
SVQ1Context *s = avctx->priv_data; SVQ1Context *s = avctx->priv_data;
av_frame_free(&s->prev); av_frame_free(&s->prev);
av_freep(&s->pkt_swapped);
return 0; return 0;
} }