Commit 81f548de authored by Justin Ruggles's avatar Justin Ruggles
Browse files

alac: check for truncated packets

This will give a clearer error message when the error is caused by a
truncated packet.
parent fb57e913
...@@ -432,16 +432,19 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data, ...@@ -432,16 +432,19 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,
ALACContext *alac = avctx->priv_data; ALACContext *alac = avctx->priv_data;
enum RawDataBlockType element; enum RawDataBlockType element;
int channels; int channels;
int ch, ret; int ch, ret, got_end;
init_get_bits(&alac->gb, avpkt->data, avpkt->size * 8); init_get_bits(&alac->gb, avpkt->data, avpkt->size * 8);
got_end = 0;
alac->nb_samples = 0; alac->nb_samples = 0;
ch = 0; ch = 0;
while (get_bits_left(&alac->gb)) { while (get_bits_left(&alac->gb) >= 3) {
element = get_bits(&alac->gb, 3); element = get_bits(&alac->gb, 3);
if (element == TYPE_END) if (element == TYPE_END) {
got_end = 1;
break; break;
}
if (element > TYPE_CPE && element != TYPE_LFE) { if (element > TYPE_CPE && element != TYPE_LFE) {
av_log(avctx, AV_LOG_ERROR, "syntax element unsupported: %d", element); av_log(avctx, AV_LOG_ERROR, "syntax element unsupported: %d", element);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
...@@ -456,11 +459,15 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data, ...@@ -456,11 +459,15 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,
ret = decode_element(avctx, data, ret = decode_element(avctx, data,
alac_channel_layout_offsets[alac->channels - 1][ch], alac_channel_layout_offsets[alac->channels - 1][ch],
channels); channels);
if (ret < 0) if (ret < 0 && get_bits_left(&alac->gb))
return ret; return ret;
ch += channels; ch += channels;
} }
if (!got_end) {
av_log(avctx, AV_LOG_ERROR, "no end tag found. incomplete packet.\n");
return AVERROR_INVALIDDATA;
}
if (avpkt->size * 8 - get_bits_count(&alac->gb) > 8) { if (avpkt->size * 8 - get_bits_count(&alac->gb) > 8) {
av_log(avctx, AV_LOG_ERROR, "Error : %d bits left\n", av_log(avctx, AV_LOG_ERROR, "Error : %d bits left\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment