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:
c655216
)
avfilter/ff_insert_pad: fix order of operations
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 21 Oct 2013 14:21:14 +0000
(16:21 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 21 Oct 2013 14:43:25 +0000
(16:43 +0200)
Fixes out of bounds access
Fixes CID732170
Fixes CID732169
No filter is known to use this function in a way so the issue can be reproduced.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfilter.c
patch
|
blob
|
history
diff --git
a/libavfilter/avfilter.c
b/libavfilter/avfilter.c
index
7ce82f8
..
f31968f
100644
(file)
--- a/
libavfilter/avfilter.c
+++ b/
libavfilter/avfilter.c
@@
-119,8
+119,8
@@
int ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off,
(*count)++;
for (i = idx + 1; i < *count; i++)
- if (
*links
[i])
- (*(unsigned *)((uint8_t *)
*links
[i] + padidx_off))++;
+ if (
(*links)
[i])
+ (*(unsigned *)((uint8_t *)
(*links)
[i] + padidx_off))++;
return 0;
}