Module: libav Branch: master Commit: 5d639b2b4a6d1f5710cfe247dea4d4c6debdfe0d
Author: Xi Wang <[email protected]> Committer: Luca Barbato <[email protected]> Date: Sat Mar 9 22:34:27 2013 -0500 vf_pad: fix a & instead of && typo Avoid buffer overflow in buffer_needs_copy() Signed-off-by: Xi Wang <[email protected]> Signed-off-by: Luca Barbato <[email protected]> --- libavfilter/vf_pad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 1c969e5..4489817 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -316,7 +316,7 @@ static int buffer_needs_copy(PadContext *s, AVFrame *frame, AVBufferRef *buf) return 1; #define SIGN(x) ((x) > 0 ? 1 : -1) - for (j = 0; j < FF_ARRAY_ELEMS(planes) & planes[j] >= 0; j++) { + for (j = 0; j < FF_ARRAY_ELEMS(planes) && planes[j] >= 0; j++) { int hsub1 = (planes[j] == 1 || planes[j] == 2) ? s->hsub : 0; uint8_t *start1 = frame->data[planes[j]]; uint8_t *end1 = start1 + (frame->height >> hsub1) * _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
