[FFmpeg-cvslog] lavfi/pad: avoid buffer overflow in buffer_needs_copy()

[Xi Wang]

ffmpeg | branch: master | Xi Wang <xi.wang at gmail.com> | Sat Mar  9 22:39:32 2013 -0500| [969e8d35b5b4c457b33df524ca95cd548a404599] | committer: Stefano Sabatini

lavfi/pad: avoid buffer overflow in buffer_needs_copy()

Replace & with short-circuit &&.

Signed-off-by: Xi Wang <xi.wang at gmail.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=969e8d35b5b4c457b33df524ca95cd548a404599
---

 libavfilter/vf_pad.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 86fd683..3f4a4f0 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -300,7 +300,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 = s->draw.hsub[planes[j]];
             uint8_t *start1 = frame->data[planes[j]];
             uint8_t *end1   = start1 + (frame->height >> hsub1) *