aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-01-17 18:57:01 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-17 20:35:36 +0100
commit321e85e1769ca1fc1567025ae264760790ee7fc9 (patch)
treee1c2cf2ac406bff9ad3bec2fb8a551e388d08731
parent033b49e02d57ffa29e208f153102ae2c0abae912 (diff)
downloadffmpeg-321e85e1769ca1fc1567025ae264760790ee7fc9.tar.gz
swscale/swscale: Add some sanity checks for srcSlice* parameters
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libswscale/swscale.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 1769348bbc..1b39577efb 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1048,12 +1048,20 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
const uint8_t *src2[4];
uint8_t *dst2[4];
uint8_t *rgb0_tmp = NULL;
+ int macro_height = isBayer(c->srcFormat) ? 2 : (1 << c->chrSrcVSubSample);
if (!srcStride || !dstStride || !dst || !srcSlice) {
av_log(c, AV_LOG_ERROR, "One of the input parameters to sws_scale() is NULL, please check the calling code\n");
return 0;
}
+ if ((srcSliceY & (macro_height-1)) ||
+ ((srcSliceH& (macro_height-1)) && srcSliceY + srcSliceH != c->srcH) ||
+ srcSliceY + srcSliceH > c->srcH) {
+ av_log(c, AV_LOG_ERROR, "Slice parameters %d, %d are invalid\n", srcSliceY, srcSliceH);
+ return AVERROR(EINVAL);
+ }
+
if (c->gamma_flag && c->cascaded_context[0]) {