OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
03a5c44
)
avcodec/pngdec: fix signed overflow
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 18 Dec 2013 21:15:32 +0000
(22:15 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 18 Dec 2013 21:15:32 +0000
(22:15 +0100)
fixes fate ftrapv failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pngdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/pngdec.c
b/libavcodec/pngdec.c
index
3d21e50
..
516dd41
100644
(file)
--- a/
libavcodec/pngdec.c
+++ b/
libavcodec/pngdec.c
@@
-226,7
+226,7
@@
static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type,
if (bpp == 4) {
p = *(int*)dst;
for (; i < size; i += bpp) {
-
int
s = *(int*)(src + i);
+
unsigned
s = *(int*)(src + i);
p = ((s & 0x7f7f7f7f) + (p & 0x7f7f7f7f)) ^ ((s ^ p) & 0x80808080);
*(int*)(dst + i) = p;
}