aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-30 23:14:32 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-08-30 23:39:02 +0200
commita2e7fd406c5b1d9095fe198c72007e4136ef5e93 (patch)
tree570f4615f40961324a504eaaae6a9dbfb34c47ea
parent7043e435dd887803ff13299269b5b4d7b0c09b3e (diff)
downloadffmpeg-a2e7fd406c5b1d9095fe198c72007e4136ef5e93.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)
-rw-r--r--libavcodec/pngdsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c
index 1ee8b57bc9..38ee458f8d 100644
--- a/libavcodec/pngdsp.c
+++ b/libavcodec/pngdsp.c
@@ -30,7 +30,7 @@
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);