diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 23:14:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 00:02:30 +0200 |
| commit | 40d4e82e2ecd53668d831df51ecc9e05ca41d5f0 (patch) | |
| tree | f2642500b997da00b49bc3cbdc42c39f5b1ea53e | |
| parent | 14f140f36942b4c79eb41d44bec6429c5919f1fe (diff) | |
| download | ffmpeg-40d4e82e2ecd53668d831df51ecc9e05ca41d5f0.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 609b21e2aa..1a0b298c37 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -133,7 +133,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); |