From 6c7d1608dd0cfcab99db2dd8fb0a00e410dd06b5 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 1 Mar 2013 14:54:34 +0000 Subject: sgidec: use unchecked bytestream2 functions where it makes sense Overreads can not happen as header size of 512 bytes is required. Signed-off-by: Paul B Mahol --- libavcodec/sgidec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libavcodec/sgidec.c') diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index 555b5044af..51bd5d6f8d 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -169,17 +169,17 @@ static int decode_frame(AVCodecContext *avctx, } /* Test for SGI magic. */ - if (bytestream2_get_be16(&s->g) != SGI_MAGIC) { + if (bytestream2_get_be16u(&s->g) != SGI_MAGIC) { av_log(avctx, AV_LOG_ERROR, "bad magic number\n"); return AVERROR_INVALIDDATA; } - rle = bytestream2_get_byte(&s->g); - s->bytes_per_channel = bytestream2_get_byte(&s->g); - dimension = bytestream2_get_be16(&s->g); - s->width = bytestream2_get_be16(&s->g); - s->height = bytestream2_get_be16(&s->g); - s->depth = bytestream2_get_be16(&s->g); + rle = bytestream2_get_byteu(&s->g); + s->bytes_per_channel = bytestream2_get_byteu(&s->g); + dimension = bytestream2_get_be16u(&s->g); + s->width = bytestream2_get_be16u(&s->g); + s->height = bytestream2_get_be16u(&s->g); + s->depth = bytestream2_get_be16u(&s->g); if (s->bytes_per_channel != 1 && (s->bytes_per_channel != 2 || rle)) { av_log(avctx, AV_LOG_ERROR, "wrong channel number\n"); -- cgit v1.2.3