[FFmpeg-cvslog] avcodec/xfacedec: fix order of operations

Paul B Mahol git at videolan.org
Fri Dec 14 00:46:58 EET 2018


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Dec 13 23:44:39 2018 +0100| [8c9fff618382bd19388f24558ff5c2fd10d85768] | committer: Paul B Mahol

avcodec/xfacedec: fix order of operations

Fixes #6745.

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

 libavcodec/xfacedec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c
index d045cb6ef4..ab4c0823f5 100644
--- a/libavcodec/xfacedec.c
+++ b/libavcodec/xfacedec.c
@@ -123,7 +123,7 @@ static int xface_decode_frame(AVCodecContext *avctx,
     if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
         return ret;
 
-    for (i = 0, k = 0; avpkt->data[i] && i < avpkt->size; i++) {
+    for (i = 0, k = 0; i < avpkt->size && avpkt->data[i]; i++) {
         c = avpkt->data[i];
 
         /* ignore invalid digits */



More information about the ffmpeg-cvslog mailing list