diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 23:14:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 03:13:28 +0200 |
| commit | e3d643cf758793577e9f99018cc7dcf753970c1d (patch) | |
| tree | 16efdd63ecc85f6f61d2fa3cf9645deeb4cb2841 | |
| parent | 1b05b0005becac06c892ea07c3dbb11f3eb5ece1 (diff) | |
| download | ffmpeg-e3d643cf758793577e9f99018cc7dcf753970c1d.tar.gz | |
avcodec/pngdsp: fix (un)signed type in end comparission
Fixes out of array accesses
Fixes Ticket2919
Found_by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 86736f59d6a527d8bc807d09b93f971c0fe0bb07)
Conflicts:
libavcodec/pngdsp.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pngdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index ae932991d3..9afa0932e1 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -107,7 +107,7 @@ static void png_put_interlaced_row(uint8_t *dst, int width, static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){ + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){ long a = *(long*)(src1+i); long b = *(long*)(src2+i); *(long*)(dst+i) = ((a&pb_7f) + (b&pb_7f)) ^ ((a^b)&pb_80); |