diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 23:14:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 02:52:04 +0200 |
| commit | 9300b1f64e5b85164e50d95dfed4a66452cb667e (patch) | |
| tree | 0ca417629e68d5649a96d376e9563444edf32af1 | |
| parent | 5230f1529ae6e5b4a0fa029930570b1961cf5e73 (diff) | |
| download | ffmpeg-9300b1f64e5b85164e50d95dfed4a66452cb667e.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
| -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 b768d38cae..5a76918e29 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -121,7 +121,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); |