virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

truemotion2: Sanitize tm2_read_header()

Browse Source 
Also give a variable a more sensible name.
This commit is contained in:
Diego Biurrun 2012-12-23 18:43:19 +01:00
parent 5e6ee38bd3
commit 117f79de2d
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libavcodec/truemotion2.c
View File

@ -200,27 +200,23 @@ static inline int tm2_get_token(GetBitContext *gb, TM2Codes *code)
return code->recode[val]; return code->recode[val];
} }
#define TM2_OLD_HEADER_MAGIC 0x00000100
#define TM2_NEW_HEADER_MAGIC 0x00000101
static inline int tm2_read_header(TM2Context *ctx, const uint8_t *buf) static inline int tm2_read_header(TM2Context *ctx, const uint8_t *buf)
{ {
uint32_t magic; uint32_t magic = AV_RL32(buf);
const uint8_t *obuf;
obuf = buf; switch (magic) {
case TM2_OLD_HEADER_MAGIC:
magic = AV_RL32(buf);
buf += 4;
if(magic == 0x00000100) { /* old header */
av_log_missing_feature(ctx->avctx, "TM2 old header", 1); av_log_missing_feature(ctx->avctx, "TM2 old header", 1);
return 40; return 0;
} else if(magic == 0x00000101) { /* new header */ case TM2_NEW_HEADER_MAGIC:
return 40; return 0;
} else { default:
av_log (ctx->avctx, AV_LOG_ERROR, "Not a TM2 header: 0x%08X\n", magic); av_log(ctx->avctx, AV_LOG_ERROR, "Not a TM2 header: 0x%08X\n", magic);
return -1; return AVERROR_INVALIDDATA;
} }
return buf - obuf;
} }
static int tm2_read_deltas(TM2Context *ctx, int stream_id) { static int tm2_read_deltas(TM2Context *ctx, int stream_id) {
@ -810,6 +806,8 @@ static const int tm2_stream_order[TM2_NUM_STREAMS] = {
TM2_C_HI, TM2_C_LO, TM2_L_HI, TM2_L_LO, TM2_UPD, TM2_MOT, TM2_TYPE TM2_C_HI, TM2_C_LO, TM2_L_HI, TM2_L_LO, TM2_UPD, TM2_MOT, TM2_TYPE
}; };
#define TM2_HEADER_SIZE 40
static int decode_frame(AVCodecContext *avctx, static int decode_frame(AVCodecContext *avctx,
void *data, int *got_frame, void *data, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
@ -818,7 +816,7 @@ static int decode_frame(AVCodecContext *avctx,
int buf_size = avpkt->size & ~3; int buf_size = avpkt->size & ~3;
TM2Context * const l = avctx->priv_data; TM2Context * const l = avctx->priv_data;
AVFrame * const p = &l->pic; AVFrame * const p = &l->pic;
int i, skip, t; int i, offset = TM2_HEADER_SIZE, t, ret;
uint8_t *swbuf; uint8_t *swbuf;
swbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE); swbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
@ -835,24 +833,24 @@ static int decode_frame(AVCodecContext *avctx,
} }
l->dsp.bswap_buf((uint32_t*)swbuf, (const uint32_t*)buf, buf_size >> 2); l->dsp.bswap_buf((uint32_t*)swbuf, (const uint32_t*)buf, buf_size >> 2);
skip = tm2_read_header(l, swbuf);
if(skip == -1){ if ((ret = tm2_read_header(l, swbuf)) < 0) {
av_free(swbuf); av_free(swbuf);
return -1; return ret;
} }
for(i = 0; i < TM2_NUM_STREAMS; i++){ for(i = 0; i < TM2_NUM_STREAMS; i++){
if (skip >= buf_size) { if (offset >= buf_size) {
av_free(swbuf); av_free(swbuf);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
t = tm2_read_stream(l, swbuf + skip, tm2_stream_order[i], buf_size - skip); t = tm2_read_stream(l, swbuf + offset, tm2_stream_order[i],
buf_size - offset);
if(t < 0){ if(t < 0){
av_free(swbuf); av_free(swbuf);
return t; return t;
} }
skip += t; offset += t;
} }
p->key_frame = tm2_decode_blocks(l, p); p->key_frame = tm2_decode_blocks(l, p);
if(p->key_frame) if(p->key_frame)