diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-21 16:21:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:25:20 +0100 |
| commit | 2448c186768608e8f2d102d4dc8c3c931718b976 (patch) | |
| tree | 7bec4487f19e97a9894be41b49df0447a03c5c55 | |
| parent | 6f9ae27f5136a29eea18effb033fe9d6f67b892e (diff) | |
| download | ffmpeg-2448c186768608e8f2d102d4dc8c3c931718b976.tar.gz | |
avfilter/ff_insert_pad: fix order of operations
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>
(cherry picked from commit ab2bfb85d49b2f8aa505816f93e75fd18ad0a361)
Conflicts:
libavfilter/avfilter.c
(cherry picked from commit 86591b244f3a27293153896813f5569b49b2f5c0)
Conflicts:
libavfilter/avfilter.c
(cherry picked from commit 400c4f8fa3fd58951dc3f356b2b00484e3363694)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avfilter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 9f49a8b2b1..11e880b379 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -112,9 +112,9 @@ void ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off, (*links)[idx] = NULL; (*count)++; - for (i = idx+1; i < *count; i++) - if (*links[i]) - (*(unsigned *)((uint8_t *) *links[i] + padidx_off))++; + for (i = idx + 1; i < *count; i++) + if ((*links)[i]) + (*(unsigned *)((uint8_t *) (*links)[i] + padidx_off))++; } int avfilter_link(AVFilterContext *src, unsigned srcpad, |