diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-23 21:14:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-23 21:47:47 +0100 |
| commit | 03ce71e4a1187340720e1569ac96c285c145a1f7 (patch) | |
| tree | 2881aaf05569244bf0d71b9932e84a0df0de7719 /libswscale/swscale.c | |
| parent | 6d579d7c1bdc4126955cae7f385208e455685986 (diff) | |
| download | ffmpeg-03ce71e4a1187340720e1569ac96c285c145a1f7.tar.gz | |
swscale/swscale: Fix dereference of stride array before null check
Fixes: CID1396263
Fixes: CID1396271
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index eb2f182ce6..ba66314c7d 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -762,10 +762,8 @@ int attribute_align_arg sws_scale(struct SwsContext *c, uint8_t *rgb0_tmp = NULL; int macro_height = isBayer(c->srcFormat) ? 2 : (1 << c->chrSrcVSubSample); // copy strides, so they can safely be modified - int srcStride2[4] = { srcStride[0], srcStride[1], srcStride[2], - srcStride[3] }; - int dstStride2[4] = { dstStride[0], dstStride[1], dstStride[2], - dstStride[3] }; + int srcStride2[4]; + int dstStride2[4]; int srcSliceY_internal = srcSliceY; if (!srcStride || !dstStride || !dst || !srcSlice) { @@ -773,6 +771,11 @@ int attribute_align_arg sws_scale(struct SwsContext *c, return 0; } + for (i=0; i<4; i++) { + srcStride2[i] = srcStride[i]; + dstStride2[i] = dstStride[i]; + } + if ((srcSliceY & (macro_height-1)) || ((srcSliceH& (macro_height-1)) && srcSliceY + srcSliceH != c->srcH) || srcSliceY + srcSliceH > c->srcH) { |