|
|
@ -248,6 +248,12 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data, |
|
|
|
|
|
|
|
|
|
|
|
ff_dlog(avctx, "pixel_size %d packed_size %d.\n", pixel_size, packed_size); |
|
|
|
ff_dlog(avctx, "pixel_size %d packed_size %d.\n", pixel_size, packed_size); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (packed_size < 0) { |
|
|
|
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "Invalid tile size %d\n", packed_size); |
|
|
|
|
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
|
|
|
|
goto end; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* Get pixels buffer, it may be deflated or just raw */ |
|
|
|
/* Get pixels buffer, it may be deflated or just raw */ |
|
|
|
if (pixel_size == packed_size) { |
|
|
|
if (pixel_size == packed_size) { |
|
|
|
if (bytestream2_get_bytes_left(gbc) < pixel_size) { |
|
|
|
if (bytestream2_get_bytes_left(gbc) < pixel_size) { |
|
|
@ -258,6 +264,11 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data, |
|
|
|
pixels = gbc->buffer; |
|
|
|
pixels = gbc->buffer; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
uLongf len = ctx->inflated_size; |
|
|
|
uLongf len = ctx->inflated_size; |
|
|
|
|
|
|
|
if (bytestream2_get_bytes_left(gbc) < packed_size) { |
|
|
|
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "Insufficient input for %d\n", packed_size); |
|
|
|
|
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
|
|
|
|
goto end; |
|
|
|
|
|
|
|
} |
|
|
|
ret = uncompress(ctx->inflated_buf, &len, gbc->buffer, packed_size); |
|
|
|
ret = uncompress(ctx->inflated_buf, &len, gbc->buffer, packed_size); |
|
|
|
if (ret) { |
|
|
|
if (ret) { |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Pixel deflate error %d.\n", ret); |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Pixel deflate error %d.\n", ret); |
|
|
|