diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c
index 185a05d6ab..2db0d67e7f 100644
--- a/libavcodec/lzw.c
+++ b/libavcodec/lzw.c
@@ -101,7 +101,7 @@ void ff_lzw_decode_tail(LZWState *p)
     struct LZWState *s = (struct LZWState *)p;
 
     if(s->mode == FF_LZW_GIF) {
-        while(s->pbuf < s->ebuf && s->bs>0){
+        while(s->pbuf + s->bs < s->ebuf && s->bs>0){
             s->pbuf += s->bs;
             s->bs = *s->pbuf++;
         }