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:35:47 +0200
commita4522ae516b58175c447b65cb44536db08f82552 (patch)
tree45b5a5cda10bcd51a70130c6038ef69e6b00bbbb
parentc7ee4bc016e56abb69fa728e124294e786fb7c01 (diff)
downloadffmpeg-a4522ae516b58175c447b65cb44536db08f82552.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 0d247759cc..5ab1c351b2 100644
--- a/libavcodec/pngdsp.c
+++ b/libavcodec/pngdsp.c
@@ -31,7 +31,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);