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:40:31 +0200
commit5bd2b24db399d9821a0396f96dc8e2392d80abe1 (patch)
treee2a387f5595f43ad75fb7aa2173f6889ce9e2d23
parentf229c598939c34df75db7845495f077b49e233d4 (diff)
downloadffmpeg-5bd2b24db399d9821a0396f96dc8e2392d80abe1.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 75ec996ca1..eb8c6b23eb 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);