And the checks nearby it.
---
libavcodec/dxtory.c | 86 +++++++++++++++++++++--------------------------------
1 file changed, 34 insertions(+), 52 deletions(-)
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 1bb2bc1..30c416d 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -335,6 +335,28 @@ static int dx2_decode_slice_rgb(GetBitContext *gb, int
width, int height,
return 0;
}
+static int load_buffer(AVCodecContext *avctx,
+ const uint8_t *src, int src_size,
+ GetByteContext *gb,
+ int *nslices, int *off)
+{
+ bytestream2_init(gb, src, src_size);
+ *nslices = bytestream2_get_le16(gb);
+ *off = FFALIGN(*nslices * 4 + 2, 16);
+ if (src_size < *off) {
+ av_log(avctx, AV_LOG_ERROR, "no slice data\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (!*nslices || avctx->height % *nslices) {
+ avpriv_request_sample(avctx, "%d slices for %dx%d", *nslices,
+ avctx->width, avctx->height);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ return 0;
+}
+
static int dxtory_decode_v2_rgb(AVCodecContext *avctx, AVFrame *pic,
const uint8_t *src, int src_size)
{
@@ -345,19 +367,9 @@ static int dxtory_decode_v2_rgb(AVCodecContext *avctx,
AVFrame *pic,
uint8_t *dst;
int ret;
- bytestream2_init(&gb, src, src_size);
- nslices = bytestream2_get_le16(&gb);
- off = FFALIGN(nslices * 4 + 2, 16);
- if (src_size < off) {
- av_log(avctx, AV_LOG_ERROR, "no slice data\n");
- return AVERROR_INVALIDDATA;
- }
-
- if (!nslices || avctx->height % nslices) {
- avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
- avctx->width, avctx->height);
- return AVERROR_PATCHWELCOME;
- }
+ ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
+ if (ret < 0)
+ return ret;
slice_height = avctx->height / nslices;
avctx->pix_fmt = AV_PIX_FMT_BGR24;
@@ -421,19 +433,9 @@ static int dxtory_decode_v2_410(AVCodecContext *avctx,
AVFrame *pic,
uint8_t *Y, *U, *V;
int ret;
- bytestream2_init(&gb, src, src_size);
- nslices = bytestream2_get_le16(&gb);
- off = FFALIGN(nslices * 4 + 2, 16);
- if (src_size < off) {
- av_log(avctx, AV_LOG_ERROR, "no slice data\n");
- return AVERROR_INVALIDDATA;
- }
-
- if (!nslices || avctx->height % nslices) {
- avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
- avctx->width, avctx->height);
- return AVERROR_PATCHWELCOME;
- }
+ ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
+ if (ret < 0)
+ return ret;
ref_slice_height = avctx->height / nslices;
if ((avctx->width & 3) || (avctx->height & 3)) {
@@ -514,19 +516,9 @@ static int dxtory_decode_v2_420(AVCodecContext *avctx,
AVFrame *pic,
uint8_t *Y, *U, *V;
int ret;
- bytestream2_init(&gb, src, src_size);
- nslices = bytestream2_get_le16(&gb);
- off = FFALIGN(nslices * 4 + 2, 16);
- if (src_size < off) {
- av_log(avctx, AV_LOG_ERROR, "no slice data\n");
- return AVERROR_INVALIDDATA;
- }
-
- if (!nslices || avctx->height % nslices) {
- avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
- avctx->width, avctx->height);
- return AVERROR_PATCHWELCOME;
- }
+ ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
+ if (ret < 0)
+ return ret;
ref_slice_height = avctx->height / nslices;
if ((avctx->width & 1) || (avctx->height & 1)) {
@@ -603,19 +595,9 @@ static int dxtory_decode_v2_444(AVCodecContext *avctx,
AVFrame *pic,
uint8_t *Y, *U, *V;
int ret;
- bytestream2_init(&gb, src, src_size);
- nslices = bytestream2_get_le16(&gb);
- off = FFALIGN(nslices * 4 + 2, 16);
- if (src_size < off) {
- av_log(avctx, AV_LOG_ERROR, "no slice data\n");
- return AVERROR_INVALIDDATA;
- }
-
- if (!nslices || avctx->height % nslices) {
- avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
- avctx->width, avctx->height);
- return AVERROR_PATCHWELCOME;
- }
+ ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
+ if (ret < 0)
+ return ret;
slice_height = avctx->height / nslices;
--
2.5.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
